Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed editor crash when deleting units

Browse source
This commit is contained in:
jsalmon3 2004-09-11 12:56:07 +00:00
parent 7d67e6ee94
commit f282234313
1 changed files with 8 additions and 3 deletions

11
src/unit/unit_cache.cpp
View file

@ -46,6 +46,7 @@
#include "unit.h"
#include "unittype.h"
#include "map.h"
#include "editor.h"
/**
** Insert new unit into cache.
@ -101,9 +102,13 @@ void UnitCacheRemove(Unit* unit)
} else {
// item is head of the list.
mf = TheMap.Fields + (i + unit->Y) * TheMap.Width + j + unit->X;
Assert(mf->UnitCache == listitem);
mf->UnitCache = listitem->Next;
Assert(!mf->UnitCache || !mf->UnitCache->Prev);
// FIXME: this check shouldn't be necessary but the editor
// FIXME: removes a unit from the cache twice
Assert(EditorRunning || mf->UnitCache == listitem);
if (mf->UnitCache == listitem) {
mf->UnitCache = listitem->Next;
Assert(!mf->UnitCache || !mf->UnitCache->Prev);
}
}
listitem->Next = listitem->Prev = NULL;