1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-21 08:00:25 +00:00
Commit Graph

206 Commits

Author SHA1 Message Date
Zeno Rogue
508c63d731 calls to rogueviz::mark and rogueviz::fixparam from HR main are now replaced by hooks 2018-07-09 18:59:12 +02:00
Arthur O'Dwyer
f10f5a29b2 Fix a couple of issues in MSVC related to min and max.
MSVC apparently thinks that the result of arithmetic promotions
on an `unsigned:4` bitfield is `unsigned`, not `int`; which then
causes it to fail to deduce whether the `T` in `min<T>` should be
`unsigned` (the type of the LHS) or `int` (the type of the RHS).
Clang and GCC agree that the result of arithmetic promotions on
an `unsigned:4` bitfield should be `int`, so they don't see any
ambiguity here.
2018-07-08 22:19:30 -07:00
Arthur O'Dwyer
eac2ce1168 Tweak this weird hack for the benefit of MSVC.
MSVC wrongly complains about the old version:

    game.cpp(6802): error C2664: 'std::pair<hr::cell *,hr::eItem> std::make_pair<hr::cell*&,hr::eItem&>(_Ty1,_Ty2)':
    cannot convert argument 2 from 'hr::eItem' to 'hr::eItem &'
        with
        [
            _Ty1=hr::cell *&,
            _Ty2=hr::eItem &
        ]

And MSVC wrongly complains about this alternative:

    conformal::findhistory.emplace_back(c2, int(c2->item));
    error: no matching function for call to 'std::pair<hr::cell*, hr::eItem>::pair(hr::cell*&, int)'

And MinGW wrongly complains about these alternatives:

    game.cpp:6801:49: error: cannot bind bitfield 'c2->hr::cell::<anonymous>.hr::gcell::item' to 'hr::eItem&'
     conformal::findhistory.emplace_back(c2, c2->item);
                                             ~~~~^~~~

    game.cpp:6801:47: error: cannot bind bitfield 'c2->hr::cell::<anonymous>.hr::gcell::item' to 'hr::eItem&'
     conformal::findhistory.push_back({c2, c2->item});
                                           ~~~~^~~~
2018-07-08 22:19:20 -07:00
Zeno Rogue
8b35bf6d4b shards collectable in laMirrorOld 2018-07-07 11:04:44 +02:00
Zeno Rogue
a8c55be1d1 Orb of Water + Orb of Empathy no longer works on enemies too 2018-07-03 04:22:35 +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
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
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
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
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
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
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
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
87dc7dcd62 renamed the global variable 'which' to 'who_kills_me' for clarity and bug prevention (would be better still to remove it) 2018-06-26 00:56:46 +02:00
Zeno Rogue
92aba5c95b fixed a bug with arrow traps not killing anything (and possibly some other cases) 2018-06-24 01:18:39 +02:00
Zeno Rogue
63869c6d33 renamed the size function to isize 2018-06-22 14:47:24 +02:00
Zeno Rogue
8f8a259992 new quotient geometries 2018-06-22 01:48:46 +02:00
Zeno Rogue
529befd359 no more ambushes when summoning orbs in the Hunting Grounds 2018-06-18 17:48:27 +02:00
Zeno Rogue
d3200253db replacing with an explicit list 2018-06-17 18:32:06 +02:00
Zeno Rogue
35301f0a68 movement animations now work in quotient geometries 2018-06-17 17:51:26 +02:00
Zeno Rogue
95a2f617cf Rock Snakes from the Snake Nest now keep their colors in other lands 2018-06-17 12:15:46 +02:00
Zeno Rogue
c0266a7164 renamed 'near' to 'isnear' ('near' is a non-standard keyword) 2018-06-13 00:42:27 +02:00
Zeno Rogue
50eaba3efd changes from zenorogue/hyperrogue#27 2018-06-12 22:40:06 +02:00
Zeno Rogue
520e5e5dbb pass lambdas to functions by reference, not by value zenorogue/hyperrogue#25 2018-06-12 22:17:08 +02:00
Zeno Rogue
75b096c58d conflicts resolved 2018-06-12 21:57:00 +02:00
Zeno Rogue
78e817c70b
Merge pull request #28 from Quuxplusone/thumper-and-boat
Pushing a thumper through a boat is no longer allowed.
2018-06-12 21:43:31 +02:00
Zeno Rogue
a2ec40537d Hunter dogs (guarding/regrouping) and sometimes wolves no longer count as a different kill type (not counted in total kills) 2018-06-12 21:13:59 +02:00
Zeno Rogue
8f183b7afb Orb of Love no longer incresaes the displayed score in the Strange Challenge 2018-06-12 18:26:20 +02:00
Zeno Rogue
c5468db000 fixed some issues with adjacency taken into account incorrectly with Hedgehogs/Flailguards/Pikemen and Warp/halfvines 2018-06-12 16:05:39 +02:00
Zeno Rogue
fc23c64c5e orb of Horns, and other cases caring about opposite cells, now work correctly in nonstandard geometries 2018-06-12 16:04:33 +02:00
Zeno Rogue
cc5909e999 fixed the Earth Elementals falling/dying in RRV 2018-06-11 18:43:13 +02:00
Zeno Rogue
147cedfd4e Orb of Recall no longer creates holes in the Yendorian Forest 2018-06-11 18:14:54 +02:00
Zeno Rogue
4c619e60dd moved all the HyperRogue stuff except RogueViz to namespace 'hr' -- useful when using hr as a library 2018-06-11 01:58:31 +02:00
Zeno Rogue
5eb084f9b0 additional help texts when the rules are different in the current geometry 2018-05-27 01:09:34 +02:00
Zeno Rogue
9fb73c79bb fixes to daily leaderboards 2018-05-27 01:06:12 +02:00
Zeno Rogue
8872c79cae Hunting Dogs no longer retreat outside of non-quotient hyperbolic geometry 2018-05-20 15:15:29 +02:00
Zeno Rogue
e6678806f9 Mirror Spirits now killed by Orb of Slaying 2018-05-15 23:27:48 +02:00
Zeno Rogue
e3c3a4202e Kraken variant of pseudohept 2018-05-04 12:49:50 +02:00
Zeno Rogue
4bf892442f Raiders take pseudohept into account 2018-05-04 12:41:36 +02:00
Zeno Rogue
70bfe718ef map no longer disappears suddenly and irreparably if you scroll into the invisible region 2018-04-23 13:20:36 +02:00
Zeno Rogue
4a8e33a2d5 better messages when dropping Dead Orbs impossible 2018-04-23 12:14:29 +02:00
Zeno Rogue
a9f80933e0 falling birds now trigger trapdoors, also animation is added 2018-04-21 14:09:17 +02:00
Zeno Rogue
d9381c7284 Clearing in bounded geometries 2018-04-14 10:24:02 +02:00