mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-24 10:27:45 +00:00
Code Issues Releases Wiki Activity

conflicts resolved

Browse Source
This commit is contained in:
Zeno Rogue
2018-06-12 21:57:00 +02:00
parent e564dd5588 eb270595f8
commit 75b096c58d
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
orbs.cpp
View File

@@ -947,12 +947,12 @@ void useOrbOfDragon(cell *c) {
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);
if(shmup::on) return 0;
if(shmup::on) return false;
if(a == roCheck && multi::players > 1)
return 1;
else if(a == roMultiCheck) return 0;
return true;
else if(a == roMultiCheck) return false;
else return monstersnear(c, nocount, who, pushto, comefrom);
}