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

correct bug#980355 [fog] crash (assert) with multiple containers

Browse source
This commit is contained in:
jarod42 2004-07-05 16:12:36 +00:00
parent 790dbe0ef7
commit ff72341516
1 changed files with 8 additions and 5 deletions

13
src/stratagus/selection.cpp
View file

@ -127,8 +127,11 @@ void ChangeSelectedUnits(Unit** units,int count)
if (count == 1 && units[0]->Type->ClicksToExplode &&
!units[0]->Type->Decoration) {
HandleSuicideClick(units[0]);
if (units[0]->Orders[0].Action == UnitActionDie) {
NetworkSendSelection(units, count);
return ;
}
}
UnSelectAll();
NetworkSendSelection(units, count);
for (n = i = 0; i < count; ++i) {
@ -343,16 +346,16 @@ int SelectUnitsByType(Unit* base)
r = UnitCacheSelect(vp->MapX - 1, vp->MapY - 1, vp->MapX + vp->MapWidth + 1,
vp->MapY + vp->MapHeight + 1, table);
if (base->Type->ClicksToExplode) {
HandleSuicideClick(base);
}
// if unit is a cadaver or hidden (not on map)
// no unit can be selected.
if (base->Removed || base->Orders[0].Action == UnitActionDie) {
return 0;
}
if (base->Type->ClicksToExplode) {
HandleSuicideClick(base);
}
if (base->Type->Decoration && GameRunning) {
return 0;
}