mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-05 11:57:58 +00:00
Code Issues Releases Wiki Activity

movei used in more places, also improved push in shmup

Browse Source
This commit is contained in:
Zeno Rogue
2019-11-22 17:31:23 +01:00
parent 8ddd95d44e
commit 2172ca6fd7
4 changed files with 97 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
locations.cpp
View File

@@ -444,6 +444,7 @@ inline cellwalker operator+ (heptspin hs, cth_t) { return cellwalker(hs.at->c7,
constexpr int STRONGWIND = 99;
constexpr int FALL = 98;
constexpr int NO_SPACE = 97;
namespace whirlwind { cell *jumpDestination(cell*); }
@@ -451,10 +452,11 @@ struct movei {
cell *s;
cell *t;
int d;
bool op() { return s != t; }
bool proper() const { return d >= 0 && d < s->type && s->move(d) == t; }
movei(cell *_s, int _d) : s(_s), d(_d) {
if(d == STRONGWIND) t = whirlwind::jumpDestination(s);
else if(d == FALL) t = s;
else if(d == FALL || d == NO_SPACE) t = s;
else t = s->move(d);
}
movei(cell *_s, cell *_t, int _d) : s(_s), t(_t), d(_d) {}