mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-19 15:20:27 +00:00
Code Issues Releases Wiki Activity

parts pushed too fast

Browse Source
This commit is contained in:
? 2019-02-08 17:08:00 +01:00
parent 458b3f5dae
commit 162542b616
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flags.cpp
View File

@ -761,4 +761,6 @@ 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

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

2
landgen.cpp
View File

@ -58,8 +58,6 @@ void buildRedWall(cell *c, int gemchance) {
bool reptilecheat = false; bool reptilecheat = false;
#define ONEMPTY if(d == 7 && passable(c, NULL, 0) && !safety)
bool blizzard_no_escape1(cell *c, manual_celllister &cl) { bool blizzard_no_escape1(cell *c, manual_celllister &cl) {
if(!cl.add(c)) return true; if(!cl.add(c)) return true;
if(c->item == itOrbSafety) if(c->item == itOrbSafety)

6
mapeditor.cpp
View File

@ -5,6 +5,9 @@ namespace hr {
namespace mapeditor { namespace mapeditor {
hyperpoint lstart;
cell *lstartcell;
struct editwhat { struct editwhat {
double dist; double dist;
int rotid, symid, pointid; int rotid, symid, pointid;
@ -1527,9 +1530,6 @@ namespace mapeditor {
return true; return true;
} }
hyperpoint lstart;
cell *lstartcell;
void drawHandleKey(int sym, int uni) { void drawHandleKey(int sym, int uni) {
handlePanning(sym, uni); handlePanning(sym, uni);

2
rogueviz-flocking.cpp
View File

@ -365,7 +365,7 @@ namespace flocking {
dialog::editNumber(N, 0, 1000, 1, 10, "", "smaller number = more precise simulation"); dialog::editNumber(N, 0, 1000, 1, 10, "", "smaller number = more precise simulation");
}); });
dialog::addSelItem("change geometry", XLAT(ginf[geometry].name), 'g'); dialog::addSelItem("change geometry", XLAT(ginf[geometry].shortname), 'g');
hr::showquotients = true; hr::showquotients = true;
dialog::add_action(runGeometryExperiments); dialog::add_action(runGeometryExperiments);