openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix crash when deleting certain elements in town

Browse Source
This commit is contained in:
Celtic Minstrel
2017-01-20 21:24:41 -05:00
parent c54cab93ee
commit 63345beb9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scenedit/scen.actions.cpp
View File

@@ -1058,7 +1058,7 @@ static bool handle_terrain_action(location the_point, bool ctrl_hit) {
// Delete not only the last entry but any other empty entries at the end of the list
do {
specials.pop_back();
} while(specials.back().spec < 0);
} while(!specials.empty() && specials.back().spec < 0);
}
break;
}
@@ -1098,7 +1098,7 @@ static bool handle_terrain_action(location the_point, bool ctrl_hit) {
town->creatures[x].number = 0;
break;
}
while(town->creatures.back().number == 0)
while(!town->creatures.empty() && town->creatures.back().number == 0)
town->creatures.pop_back();
overall_mode = MODE_DRAWING;
break;
@@ -1109,7 +1109,7 @@ static bool handle_terrain_action(location the_point, bool ctrl_hit) {
town->preset_items[x].code = -1;
break;
}
while(town->preset_items.back().code == -1)
while(!town->preset_items.empty() && town->preset_items.back().code == -1)
town->preset_items.pop_back();
overall_mode = MODE_DRAWING;
break;