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

newnet: Make DORDER_RTB on a droid with DACTION_MOVETOBUILD not crash in skirmish. 

Don't know why it's only in newnet and not trunk, that the AI sends DORDER_RTB in skirmish.

Closes ticket:2010.
master
Cyp 2010-07-21 13:34:18 +02:00
parent 4e8f1fb7f3
commit 0c93c007b9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/multibot.cpp
View File

@ -709,6 +709,8 @@ BOOL recvDroidInfo(NETQUEUE queue)
continue; // Can't find the droid, so skip this droid.
}
CHECK_DROID(psDroid);
syncDebugDroid(psDroid, '<');
psDroid->waitingForOwnReceiveDroidInfoMessage = false;
@ -750,6 +752,7 @@ BOOL recvDroidInfo(NETQUEUE queue)
syncDebugDroid(psDroid, '>');
CHECK_DROID(psDroid);
}
}
NETend();

3
src/order.c
View File

@ -1866,7 +1866,10 @@ void orderDroidBase(DROID *psDroid, DROID_ORDER_DATA *psOrder)
else
{
// haven't got an LZ set up so don't do anything
actionDroid(psDroid, DACTION_NONE);
psDroid->order = DORDER_NONE;
setDroidTarget(psDroid, NULL);
psDroid->psTarStats = NULL;
}
}
break;