Skip to content

Commit

Permalink
Backport: Fix crash where rearming VTOL would try to set a dead target.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/2.0@2652 4a71c877-e1ca-e34f-864e-861f7616d084
  • Loading branch information
perim committed Oct 27, 2007
1 parent 9432bc2 commit 5bcda19
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/order.c
Original file line number Diff line number Diff line change
Expand Up @@ -1169,18 +1169,13 @@ if(!bMultiPlayer || myResponsibility(psDroid->player))
ASSERT( FALSE, "orderUpdateUnit: unknown order" );
}


// catch any vtol that is rearming but has finished his order
if ((psDroid->order == DORDER_NONE) &&
vtolRearming(psDroid))
if (psDroid->order == DORDER_NONE && vtolRearming(psDroid)
&& (psDroid->psActionTarget[0] == NULL || !psDroid->psActionTarget[0]->died))
{
// DBPRINTF(("VTOL %d: reseting to rearm order\n", psDroid->id));
psDroid->order = DORDER_REARM;
psDroid->psTarget = psDroid->psActionTarget;
}

// ASSERT( psDroid->x != 0 && psDroid->y != 0,
// "orderUpdateUnit: unit at (0,0)" );
}


Expand Down

0 comments on commit 5bcda19

Please sign in to comment.