Relax droid assert about being on the map. Patch by Buginator in bug #958.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3782 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-02-15 18:49:43 +00:00
parent b92c8c5a33
commit c561c73cd8
1 changed files with 2 additions and 2 deletions

View File

@ -5771,9 +5771,9 @@ BOOL cyborgDroid(DROID *psDroid)
BOOL droidOnMap(DROID *psDroid)
{
if (psDroid->died == NOT_CURRENT_LIST || psDroid->droidType == DROID_TRANSPORTER
|| psDroid->sMove.fx == INVALID_XY || psDroid->pos.x == INVALID_XY)
|| psDroid->sMove.fx == INVALID_XY || psDroid->pos.x == INVALID_XY || missionIsOffworld())
{
// Off world or on a transport or is a transport or in mission list - ignore
// Off world or on a transport or is a transport or in mission list, or on a mission - ignore
return TRUE;
}
return (worldOnMap(psDroid->sMove.fx, psDroid->sMove.fy)