Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes r5507 (trunk) & r5568 (branch) and closes bug # 12219 , and report of same bug in forms. 

Issue was, orders were not given to pre positioned droid units.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5849 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2008-08-23 18:35:59 +00:00
parent 30712505f1
commit 0ab4d2b32c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ai.c
View File

@ -892,7 +892,10 @@ void aiUpdateDroid(DROID *psDroid)
ASSERT( psDroid != NULL,
"updateUnitAI: invalid Unit pointer" );
if (!myResponsibility(psDroid->player))
// HACK: we always want to update orders when NOT running a MP game,
// and we don't want to update when the droid belongs to another human player
if (!myResponsibility(psDroid->player) && bMultiPlayer
&& isHumanPlayer(psDroid->player))
{
return; // we should not order this droid around
}

10
src/order.c
View File

@ -301,7 +301,10 @@ void orderUpdateDroid(DROID *psDroid)
// started a new order, quit
break;
}
else if (!myResponsibility(psDroid->player))
// HACK: we always want to update orders when NOT running a MP game,
// and we don't want to update when the droid belongs to another human player
else if (!myResponsibility(psDroid->player) && bMultiPlayer
&& isHumanPlayer(psDroid->player))
{
return;
}
@ -1085,7 +1088,10 @@ void orderUpdateDroid(DROID *psDroid)
// started a queued order - quit
break;
}
else if (!myResponsibility(psDroid->player))
// HACK: we always want to update orders when NOT running a MP game,
// and we don't want to update when the droid belongs to another human player
else if (!myResponsibility(psDroid->player) && bMultiPlayer
&& isHumanPlayer(psDroid->player))
{
return;
}