mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-26 00:47:00 +00:00
Code Issues Releases Wiki Activity

renamed 'near' to 'isnear' ('near' is a non-standard keyword)

Browse Source
This commit is contained in:
Zeno Rogue 2018-06-13 00:42:27 +02:00
parent 945c8a3f71
commit c0266a7164
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
complex.cpp
View File

@ -2496,7 +2496,7 @@ namespace sword {
return false; return false;
} }
bool near(cell *where) { bool isnear(cell *where) {
if(at(where, false)) return true; if(at(where, false)) return true;
forCellEx(w2, where) if(at(w2, false)) return true; forCellEx(w2, where) if(at(w2, false)) return true;
return false; return false;

6
game.cpp
View File

@ -3758,7 +3758,7 @@ int moveval(cell *c1, cell *c2, int d, flagtype mf) {
return 1500 + celldistance(c1, dragon::target) - celldistance(c2, dragon::target); return 1500 + celldistance(c1, dragon::target) - celldistance(c2, dragon::target);
// Goblins avoid getting near the Sword // Goblins avoid getting near the Sword
if(m == moGoblin && sword::near(c2)) return 790; if(m == moGoblin && sword::isnear(c2)) return 790;
if(m == moBat && batsAfraid(c2)) return 790; if(m == moBat && batsAfraid(c2)) return 790;
if(m == moButterfly) if(m == moButterfly)
@ -3778,7 +3778,7 @@ int moveval(cell *c1, cell *c2, int d, flagtype mf) {
// goblins blocked by anglophobia prefer to move around than to stay // goblins blocked by anglophobia prefer to move around than to stay
if(m == moGoblin) { if(m == moGoblin) {
bool swn = false; bool swn = false;
forCellEx(c3, c1) if(sword::near(c3)) swn = true; forCellEx(c3, c1) if(sword::isnear(c3)) swn = true;
if(swn) dd += 210; if(swn) dd += 210;
} }
@ -3797,7 +3797,7 @@ int stayval(cell *c, flagtype mf) {
if(isRatling(c->monst) && lastmovetype != lmSkip) if(isRatling(c->monst) && lastmovetype != lmSkip)
return 700; return 700;
// Goblins avoid staying near the Sword (if there is no choice, movement is preferred) // Goblins avoid staying near the Sword (if there is no choice, movement is preferred)
if(c->monst == moGoblin && sword::near(c)) return 780; if(c->monst == moGoblin && sword::isnear(c)) return 780;
// Vikings move in a roughly straight line even if they cannot detect you // Vikings move in a roughly straight line even if they cannot detect you
if(c->monst == moViking && c->wall == waBoat) if(c->monst == moViking && c->wall == waBoat)
return 750; return 750;