From b4c9ca5f102c23bbbd6bacffce6634d404bd6530 Mon Sep 17 00:00:00 2001 From: Cyp Date: Sun, 9 Jan 2011 05:21:32 +0100 Subject: [PATCH] Fix desynch on unassigning droids from commander. --- src/order.cpp | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/order.cpp b/src/order.cpp index 5480d5a71..9f46962f9 100644 --- a/src/order.cpp +++ b/src/order.cpp @@ -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(, 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); 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(!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); 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; } - // 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 bOrderEffectDisplayed = false; @@ -3067,15 +3058,6 @@ void orderSelectedObjAdd(UDWORD player, BASE_OBJECT *psObj, BOOL add) DROID *psCurr; 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 bOrderEffectDisplayed = false;