mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-22 00:04:07 +00:00
Code Issues Releases Wiki Activity

some fixes due to weird action in git

Browse Source
This commit is contained in:
Zeno Rogue 2019-03-01 01:20:14 +01:00
parent c914b2632c
commit a52755bf50
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flags.cpp
View File

@ -769,6 +769,4 @@ bool is_mirrorland(cell *c) {
return among(c->land, laMirror, laMirrorOld); return among(c->land, laMirror, laMirrorOld);
} }
bool isPushable(eWall w) { return w == waThumperOn; }
} }

2
game.cpp
View File

@ -3544,7 +3544,7 @@ void uncoverMinesFull(cell *c2) {
items[itBombEgg] < 30 ? 2 : items[itBombEgg] < 30 ? 2 :
3; 3;
bool nomine = false; bool nomine = !normal_gravity_at(c2);
if(!nomine && uncoverMines(c2, mineradius, 0, true) && markOrb(itOrbAether)) if(!nomine && uncoverMines(c2, mineradius, 0, true) && markOrb(itOrbAether))
nomine = true; nomine = true;

1
mapeditor.cpp
View File

@ -1923,7 +1923,6 @@ namespace mapeditor {
if(c == ls) if(c == ls)
textrans = inverse(V * applyPatterndir(ls, sio)); textrans = inverse(V * applyPatterndir(ls, sio));
#if CAP_TEXTURE
transmatrix mh = textrans * rgpushxto0(mouseh); transmatrix mh = textrans * rgpushxto0(mouseh);
transmatrix ml = textrans * rgpushxto0(lstart); transmatrix ml = textrans * rgpushxto0(lstart);