1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 21:37:18 +00:00
Commit Graph

1705 Commits

Author SHA1 Message Date
Arthur O'Dwyer
0946300663 Clean up the autotools.
It still seems to work on MinGW mainly by accident,
but at least it's a lot shorter and clearer and more
portable at this point. We can start testing it in
TravisCI and then work on making it work "less by accident"
incrementally.
2018-07-01 12:38:08 -07:00
Zeno Rogue
23a3cb4a53
Merge pull request #46 from Quuxplusone/direntx
Switch the Windows "direntx.h" to something that works even on MSVC.
2018-06-30 17:25:04 +02:00
Zeno Rogue
e5fe57fdbf rogueviz:: fixed the use of rand to hrand 2018-06-30 16:37:39 +02:00
Zeno Rogue
11d9d3de5a renamed the global variable r to hrngen; added a commentr about hrngen; fixed hrandom_shuffle in rogueviz-kohonen 2018-06-30 16:29:37 +02:00
Zeno Rogue
e9c82a5005 Merge branch 'master' of https://github.com/zenorogue/hyperrogue 2018-06-30 16:21:26 +02:00
Zeno Rogue
5ab0f98c83
Merge pull request #47 from Quuxplusone/misc-portability
Eliminate VLAs; eliminate std::random_shuffle()
2018-06-30 16:24:43 +02:00
Zeno Rogue
f47e0870a8 renamed the global variable N to blizzard_N 2018-06-30 16:21:06 +02:00
Arthur O'Dwyer
a563f89147 Eliminate an unnecessary <unistd.h> for the benefit of MSVC.
It's still conditionally included under `CAP_SAVE`, so I think
this won't break any non-MSVC platform.
2018-06-29 16:51:10 -07:00
Arthur O'Dwyer
1996b0ccf7 Add "inline" to silence GCC's -Wunused-function warnings in direntx.h.
Another option would be to surround the file with

    #pragma GCC diagnostic push
    #pragma GCC diagnostic ignored "-Wunused-function"
    [...]
    #pragma GCC diagnostic pop

but then I'd have to suppress "unknown pragma" warnings on MSVC.
This way is more invasive but cleaner to look at.
2018-06-29 16:26:20 -07:00
Arthur O'Dwyer
53d8f8701d Switch out "dirent.h" for Windows.
The new version comes straight from
https://raw.githubusercontent.com/tronkko/dirent/master/include/dirent.h
2018-06-29 16:03:25 -07:00
Arthur O'Dwyer
1a93fbcd45 Stop using the deprecated std::random_shuffle, for the benefit of MSVC.
And generalize `hrandom_shuffle` to take an arbitrary `Iter`,
so that passing `vec.begin()` will work even with MSVC's
debug iterators. (Passing `&vec[0]` or `vec.data()` would work
either way, but I'd worry that someone would forget to do that
conscientiously every time.)
2018-06-29 14:20:03 -07:00
Arthur O'Dwyer
62db7ee250 Eliminate VLAs for the benefit of MSVC. 2018-06-29 14:13:59 -07:00
Zeno Rogue
6753cc2e39 10.3i 2018-06-29 13:18:04 +02:00
Zeno Rogue
cb1a65221c [10.3i] random pattern mode: randomized the starting land; Baby Tortoises no longer appear 2018-06-29 13:16:31 +02:00
Zeno Rogue
941982be98 [10.3i] fixed gaining extra bullets in the Wild West 2018-06-29 13:15:44 +02:00
Zeno Rogue
0f4de1fa9a [10.3i] fixed shooting in the Wild West 2018-06-29 13:14:49 +02:00
Zeno Rogue
0faccacaf6 10.4i 2018-06-29 12:30:56 +02:00
Zeno Rogue
91d203f556 fixed the help display when chaos mode locked 2018-06-29 12:30:41 +02:00
Zeno Rogue
53e9cb3ca5 fixed a crash introduced in 10.4h 2018-06-29 12:29:23 +02:00
Zeno Rogue
f1f1098d95 removed some remaining references to sval, fixed the compilation of RogueViz 2018-06-29 12:16:35 +02:00
Zeno Rogue
313dd233a2
Merge pull request #43 from AMDmi3/travis
Add Travis CI support
2018-06-28 15:24:38 +02:00
Zeno Rogue
bb45975fb3
Merge pull request #44 from Quuxplusone/misc-windows
Miscellaneous Windows updates.
2018-06-28 15:13:54 +02:00
Zeno Rogue
0d0eb06886
Merge branch 'master' into misc-windows 2018-06-28 15:13:42 +02:00
Zeno Rogue
9e44c593a0 10.4h 2018-06-28 15:08:38 +02:00
Zeno Rogue
3701b23c43 rogueviz::kohonen:: using manual_celllister instead of sval 2018-06-28 14:56:41 +02:00
Zeno Rogue
b01cee20d5 fixed one more bug with pathdata 2018-06-28 14:56:12 +02:00
Zeno Rogue
5e891cf66e fixed the uninitialized variable warnings 2018-06-28 14:30:34 +02:00
Zeno Rogue
c2d7b0c011 fixed the map not being generated far enough in non-std geometries after Teleport (and other orbs) 2018-06-28 14:14:18 +02:00
Zeno Rogue
92240a0eeb fixed the missing message when picking up orbs from a boat 2018-06-28 13:35:15 +02:00
Zeno Rogue
cf8dffd6b8 fixed bugs with manual celllisters 2018-06-28 13:35:03 +02:00
Zeno Rogue
d11044a80a refactoring: sval/aitmp is no more, celllister(manual) used instead 2018-06-28 12:59:35 +02:00
Zeno Rogue
ed8ff63ce4 removed some more incorrect instances of pathdist 2018-06-28 11:55:59 +02:00
Zeno Rogue
c6412511f5 fixed a bug in leader movement by using pathdist; also made pathdist more robust 2018-06-28 11:42:25 +02:00
Zeno Rogue
ad74267080 Orb of Freedom now considers active arrow traps as impassable 2018-06-28 10:40:25 +02:00
Zeno Rogue
2d6f7d4ed0 five-kill achievement now also counts the 'basic' kill 2018-06-28 10:40:02 +02:00
Zeno Rogue
dd9723dc00 Orb of Freedom is now checked after the Terracotta Warriors 2018-06-28 10:39:35 +02:00
Zeno Rogue
b042a457cc non-player multikills are no longer counted for achievements 2018-06-28 10:39:15 +02:00
Zeno Rogue
c3feb7ddb7 a fix to windcodes 2018-06-28 10:38:25 +02:00
Zeno Rogue
992d952005 in quotient geometries, the whole world is now generated at level 8 (otherwise Blizzard breaks down) 2018-06-28 10:29:32 +02:00
Zeno Rogue
95b1c4d9fa rogueviz::sag:: min_visible_weight is now configurable 2018-06-28 10:28:37 +02:00
Zeno Rogue
3e566b9fdb kohonen::sag:: calling fixStorage (no more holes) 2018-06-28 10:28:08 +02:00
Zeno Rogue
9f5667adc5 rogueviz::kohonen:: an option to restrict the number of cells used 2018-06-28 10:27:35 +02:00
Zeno Rogue
82cd394fb0 fixed the windmap in the Field Quotient geometry 2018-06-28 10:26:56 +02:00
Arthur O'Dwyer
034514778d Avoid two more encroachments by Windows into the user's namespace.
"hyper" is described here: https://sourceforge.net/p/mingw/mailman/message/8593274/

"rad1" is described here: http://lolengine.net/blog/2011/3/4/fuck-you-microsoft-near-far-macros
2018-06-27 03:12:48 -07:00
Arthur O'Dwyer
121e2a60d3 Silence a (bogus?) -Wmaybe-uninitialized from MinGW. 2018-06-27 03:01:58 -07:00
Arthur O'Dwyer
817f690ae3 Silence a couple of warnings with -DCAP_TEXTURE=0 (the default on MinGW). 2018-06-27 03:01:58 -07:00
Arthur O'Dwyer
a346e05bbc Eliminate variable shadowing in langen.cpp. 2018-06-27 03:01:58 -07:00
Arthur O'Dwyer
00e1db9f05 Eliminate directives inside macro expansions, for the benefit of MSVC. 2018-06-27 03:01:56 -07:00
Dmitry Marakasov
823930a1cf Call hyperrogue after build, as a smoke test 2018-06-26 15:48:54 +03:00
Dmitry Marakasov
7ead4fd7ac Set proper c++ standard for landgen 2018-06-26 15:42:49 +03:00