From 81de4a1622bbbe5c2478e47d8845a1de8339ddf3 Mon Sep 17 00:00:00 2001 From: Roman C Date: Wed, 19 Mar 2008 15:58:36 +0000 Subject: [PATCH] Fix a commander-related crash. git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4155 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/order.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/order.c b/src/order.c index 560a75ea4..09bb2437d 100644 --- a/src/order.c +++ b/src/order.c @@ -1184,7 +1184,8 @@ void orderUpdateDroid(DROID *psDroid) } // make sure units in a command group are actually guarding the commander - if (!orderStateObj(psDroid, DORDER_GUARD) + psObj = orderStateObj(psDroid, DORDER_GUARD); // find out who is being guarded by the droid + if (psObj == NULL || psObj != (BASE_OBJECT *)psDroid->psGroup->psCommander) { orderDroidObj(psDroid, DORDER_GUARD, (BASE_OBJECT *)psDroid->psGroup->psCommander);