libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 10:48:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MADS: Fix bugs in SpriteSets::remove()

Browse Source 
This fixes several crashes when sprites get erased, like for example in
death animations
This commit is contained in:
Filippos Karapetis 2014-05-04 03:54:54 +03:00
parent 27982c850a
commit 0023e99621
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/mads/sprites.cpp
View File

@ -399,17 +399,21 @@ void SpriteSets::clear() {
void SpriteSets::remove(int idx) {
if (idx >= 0) {
delete (*this)[idx];
if (idx < ((int)size() - 1)) {
delete (*this)[idx];
(*this)[idx] = nullptr;
} else {
do {
while (size() > 0 && (*this)[size() - 1] == nullptr) {
delete (*this)[size() - 1];
remove_at(size() - 1);
} while (size() > 0 && (*this)[size() - 1] == nullptr);
}
}
--_assetCount;
if (_assetCount > 0)
--_assetCount;
else
// FIXME: This is needed, otherwise scene sprites are not cleared in this case
clear();
}
}