mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-03-24 04:17:03 +00:00
some fixes due to weird action in git
This commit is contained in:
parent
c914b2632c
commit
a52755bf50
@ -769,6 +769,4 @@ bool is_mirrorland(cell *c) {
|
||||
return among(c->land, laMirror, laMirrorOld);
|
||||
}
|
||||
|
||||
bool isPushable(eWall w) { return w == waThumperOn; }
|
||||
|
||||
}
|
||||
|
2
game.cpp
2
game.cpp
@ -3544,7 +3544,7 @@ void uncoverMinesFull(cell *c2) {
|
||||
items[itBombEgg] < 30 ? 2 :
|
||||
3;
|
||||
|
||||
bool nomine = false;
|
||||
bool nomine = !normal_gravity_at(c2);
|
||||
if(!nomine && uncoverMines(c2, mineradius, 0, true) && markOrb(itOrbAether))
|
||||
nomine = true;
|
||||
|
||||
|
@ -1923,7 +1923,6 @@ namespace mapeditor {
|
||||
if(c == ls)
|
||||
textrans = inverse(V * applyPatterndir(ls, sio));
|
||||
|
||||
#if CAP_TEXTURE
|
||||
transmatrix mh = textrans * rgpushxto0(mouseh);
|
||||
transmatrix ml = textrans * rgpushxto0(lstart);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user