mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

Fix the return type of monstersnear.

Browse Source 
No intended functional change.
This commit is contained in:
Arthur O'Dwyer 2017-12-20 15:34:49 -08:00
parent f111c8b209
commit eb270595f8
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
game.cpp
View File

@ -1038,8 +1038,6 @@ bool outlawNearby(cell *c, int dist) {
return false; return false;
} }
// int monstersnear(cell *c, cell *nocount = NULL, eMonster who = moPlayer, cell *pushto = NULL) {
namespace stalemate { namespace stalemate {
bool anyKilled() { bool anyKilled() {
for(int i=0; i<size(moves); i++) if(moves[i].killed) return true; for(int i=0; i<size(moves); i++) if(moves[i].killed) return true;
@ -1074,12 +1072,12 @@ bool krakensafe(cell *c) {
(c->item == itOrbAether && c->wall == waBoat); (c->item == itOrbAether && c->wall == waBoat);
} }
int monstersnear(stalemate1& sm) { bool monstersnear(stalemate1& sm) {
cell *c = sm.moveto; cell *c = sm.moveto;
bool eaten = false; bool eaten = false;
if(hardcore && sm.who == moPlayer) return 0; if(hardcore && sm.who == moPlayer) return false;
int res = 0; int res = 0;
bool fast = false; bool fast = false;
@ -1156,12 +1154,12 @@ int monstersnear(stalemate1& sm) {
if(sm.who == moPlayer && res && markOrb2(itOrbDomination) && c->monst) if(sm.who == moPlayer && res && markOrb2(itOrbDomination) && c->monst)
res = 0; res = 0;
return res; return !!res;
} }
namespace multi { bool aftermove; } namespace multi { bool aftermove; }
int monstersnear2(); bool monstersnear2();
int lastkills; int lastkills;
@ -1194,9 +1192,9 @@ bool swordConflict(const stalemate1& sm1, const stalemate1& sm2) {
return false; return false;
} }
int monstersnear2() { bool monstersnear2() {
multi::cpid++; multi::cpid++;
int b = 0; bool b = false;
bool recorduse[ittypes]; bool recorduse[ittypes];
for(int i=0; i<ittypes; i++) recorduse[i] = orbused[i]; for(int i=0; i<ittypes; i++) recorduse[i] = orbused[i];
if(multi::cpid == multi::players || multi::players == 1 || multi::checkonly) { if(multi::cpid == multi::players || multi::players == 1 || multi::checkonly) {
@ -1210,13 +1208,13 @@ int monstersnear2() {
for(int i=0; i<size(stalemate::moves); i++) for(int i=0; i<size(stalemate::moves); i++)
for(int j=0; j<size(stalemate::moves); j++) if(i != j) { for(int j=0; j<size(stalemate::moves); j++) if(i != j) {
if(swordConflict(stalemate::moves[i], stalemate::moves[j])) { if(swordConflict(stalemate::moves[i], stalemate::moves[j])) {
b = 1; b = true;
which = moEnergySword; which = moEnergySword;
} }
if(multi::player[i].c == multi::player[j].c) if(multi::player[i].c == multi::player[j].c)
{ b = 1; which = moFireball; } { b = true; which = moFireball; }
if(celldistance(multi::player[i].c, multi::player[j].c) > 8) if(celldistance(multi::player[i].c, multi::player[j].c) > 8)
{ b = 1; which = moAirball; } { b = true; which = moAirball; }
} }
for(int i=0; !b && i<size(stalemate::moves); i++) for(int i=0; !b && i<size(stalemate::moves); i++)
@ -1228,7 +1226,7 @@ int monstersnear2() {
return b; return b;
} }
int monstersnear(cell *c, cell *nocount, eMonster who, cell *pushto, cell *comefrom) { bool monstersnear(cell *c, cell *nocount, eMonster who, cell *pushto, cell *comefrom) {
if(peace::on) return 0; // you are safe if(peace::on) return 0; // you are safe
@ -1260,7 +1258,7 @@ int monstersnear(cell *c, cell *nocount, eMonster who, cell *pushto, cell *comef
// dynamicval<eMonster> x7(stalemate::who, who); // dynamicval<eMonster> x7(stalemate::who, who);
int b; bool b;
if(who == moPlayer && c->wall == waBigStatue) { if(who == moPlayer && c->wall == waBigStatue) {
eWall w = comefrom->wall; eWall w = comefrom->wall;
c->wall = waNone; c->wall = waNone;

8
orbs.cpp
View File

@ -882,12 +882,12 @@ void useOrbOfDragon(cell *c) {
checkmoveO(); checkmoveO();
} }
int monstersnearO(orbAction a, cell *c, cell *nocount, eMonster who, cell *pushto, cell *comefrom) { bool monstersnearO(orbAction a, cell *c, cell *nocount, eMonster who, cell *pushto, cell *comefrom) {
// printf("[a = %d] ", a); // printf("[a = %d] ", a);
if(shmup::on) return 0; if(shmup::on) return false;
if(a == roCheck && multi::players > 1) if(a == roCheck && multi::players > 1)
return 1; return true;
else if(a == roMultiCheck) return 0; else if(a == roMultiCheck) return false;
else return monstersnear(c, nocount, who, pushto, comefrom); else return monstersnear(c, nocount, who, pushto, comefrom);
} }