mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-15 06:17:38 +00:00
Code Issues Releases Wiki Activity

fixed some shmup-related crashes

Browse Source
This commit is contained in:
Zeno Rogue
2018-11-17 19:26:35 +01:00
parent e7b90fdb05
commit d7a235bc8c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shmup.cpp
View File

@@ -1197,7 +1197,8 @@ void shootBullet(monster *m) {
}
void killThePlayer(eMonster m) {
pc[cpid]->dead = true;
if(cpid >= 0 && cpid < MAXPLAYER && pc[cpid])
pc[cpid]->dead = true;
}
monster *playerCrash(monster *who, hyperpoint where) {
@@ -3293,13 +3294,16 @@ void clearMemory() {
nextmove = 0;
nextdragon = 0;
visibleAt = 0;
for(int i=0; i<MAXPLAYER; i++) pc[i] = NULL;
}
cell *playerpos(int i) {
if(!pc[i]) return NULL;
return pc[i]->base;
}
bool playerInBoat(int i) {
if(!pc[i]) return false;
return pc[i]->inBoat;
}