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

Fix desynch on unassigning droids from commander.

master
Cyp 2011-01-09 05:21:32 +01:00
parent b143d53ae1
commit b4c9ca5f10
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/order.cpp
View File

@ -2146,7 +2146,7 @@ void orderDroidLoc(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWORD y, QUEUE_
ASSERT_OR_RETURN(, psDroid != NULL, "Invalid unit pointer"); ASSERT_OR_RETURN(, psDroid != NULL, "Invalid unit pointer");
ASSERT_OR_RETURN(, validOrderForLoc(order), "Invalid order for location"); ASSERT_OR_RETURN(, validOrderForLoc(order), "Invalid order for location");
if (mode == ModeQueue && bMultiPlayer) //ajl if (mode == ModeQueue) //ajl
{ {
sendDroidInfo(psDroid, order, x, y, NULL, NULL, 0, 0, 0, false); sendDroidInfo(psDroid, order, x, y, NULL, NULL, 0, 0, 0, false);
return; // Wait to receive our order before changing the droid. return; // Wait to receive our order before changing the droid.
@ -2206,7 +2206,7 @@ void orderDroidObj(DROID *psDroid, DROID_ORDER order, BASE_OBJECT *psObj, QUEUE_
ASSERT(validOrderForObj(order), "Invalid order for object"); ASSERT(validOrderForObj(order), "Invalid order for object");
ASSERT(!isBlueprint(psObj), "Target is a blueprint"); ASSERT(!isBlueprint(psObj), "Target is a blueprint");
if (mode == ModeQueue && bMultiPlayer) //ajl if (mode == ModeQueue) //ajl
{ {
sendDroidInfo(psDroid, order, 0, 0, psObj, NULL, 0, 0, 0, false); sendDroidInfo(psDroid, order, 0, 0, psObj, NULL, 0, 0, 0, false);
return; // Wait for the order to be received before changing the droid. return; // Wait for the order to be received before changing the droid.
@ -2733,15 +2733,6 @@ void orderSelectedLoc(uint32_t player, uint32_t x, uint32_t y, bool add)
return; return;
} }
// remove any units from their command group
for(psCurr = apsDroidLists[player]; psCurr; psCurr=psCurr->psNext)
{
if (psCurr->selected && hasCommander(psCurr))
{
grpLeave(psCurr->psGroup, psCurr);
}
}
// note that an order list graphic needs to be displayed // note that an order list graphic needs to be displayed
bOrderEffectDisplayed = false; bOrderEffectDisplayed = false;
@ -3067,15 +3058,6 @@ void orderSelectedObjAdd(UDWORD player, BASE_OBJECT *psObj, BOOL add)
DROID *psCurr; DROID *psCurr;
DROID_ORDER order; DROID_ORDER order;
// remove any units from their command group
for(psCurr = apsDroidLists[player]; psCurr; psCurr=psCurr->psNext)
{
if (psCurr->selected && hasCommander(psCurr))
{
grpLeave(psCurr->psGroup, psCurr);
}
}
// note that an order list graphic needs to be displayed // note that an order list graphic needs to be displayed
bOrderEffectDisplayed = false; bOrderEffectDisplayed = false;