mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 22:12:59 +00:00
Code Issues Releases Wiki Activity

savemem:: removed some more potential crashes

Browse Source
This commit is contained in:
Zeno Rogue
2022-07-17 12:42:35 +02:00
parent 7c1d083afa
commit 6225fd38e8
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
monstermove.cpp
View File

@@ -817,6 +817,7 @@ EX void moveWorm(cell *c) {
while(c2->mondir != NODIR) {
allcells.push_back(c2);
c2 = c2->move(c2->mondir);
if(!c2) { allcells.pop_back(); break; }
}
allcells.push_back(c2);
for(int i=isize(allcells)-2; i>=0; i--) {
@@ -865,7 +866,7 @@ EX void moveWorm(cell *c) {
}
eItem loc = treasureType(c->land);
bool spiceSeen = false;
while(c->monst == moWorm || c->monst == moWormtail || c->monst == moTentacle || c->monst == moTentacletail) {
while(c && (c->monst == moWorm || c->monst == moWormtail || c->monst == moTentacle || c->monst == moTentacletail)) {
// if(!id)
explodeAround(c);
drawParticles(c, minf[c->monst].color, 16);
@@ -981,7 +982,7 @@ EX void removeIvy(cell *c) {
c->monst = moNone; // NEWYEARFIX
for(int i=0; i<c->type; i++)
// note that semi-vines don't count
if(c->move(i)->wall == waVinePlant) {
if(c->move(i) && c->move(i)->wall == waVinePlant) {
destroyHalfvine(c);
if (!do_not_touch_this_wall(c))
c->wall = waVinePlant;