From c789c1953f5866086d6c27ca11be3e7db2e1a947 Mon Sep 17 00:00:00 2001 From: lalien Date: Mon, 12 May 2008 08:35:50 +0000 Subject: [PATCH] Added changes from build 2137 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2145 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Multiplayer/client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 5ea161ff..e058b3a1 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -2269,7 +2269,7 @@ void UpdateSoldierToNetwork ( SOLDIERTYPE *pSoldier ) SUpdateNetworkSoldier.bBleeding=pSoldier->bBleeding; SUpdateNetworkSoldier.ubDirection=pSoldier->ubDirection; - if((gTacticalStatus.ubTopMessageType == PLAYER_TURN_MESSAGE ||gTacticalStatus.ubTopMessageType == PLAYER_INTERRUPT_MESSAGE) && (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT))//update progress bar, not supporting coop yet... + if((gTacticalStatus.ubTopMessageType == PLAYER_TURN_MESSAGE || gTacticalStatus.ubTopMessageType == PLAYER_INTERRUPT_MESSAGE) && (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT))//update progress bar, not supporting coop yet... { SUpdateNetworkSoldier.usTactialTurnLimitCounter = gTacticalStatus.usTactialTurnLimitCounter; SUpdateNetworkSoldier.usTactialTurnLimitMax = gTacticalStatus.usTactialTurnLimitMax; @@ -2311,7 +2311,7 @@ void UpdateSoldierFromNetwork (RPCParameters *rpcParameters) pSoldier->bBleeding=SUpdateNetworkSoldier->bBleeding; - if( SUpdateNetworkSoldier->usTactialTurnLimitCounter != 9999 && (gTacticalStatus.ubTopMessageType != PLAYER_TURN_MESSAGE || gTacticalStatus.ubTopMessageType != PLAYER_INTERRUPT_MESSAGE)) + if( (SUpdateNetworkSoldier->usTactialTurnLimitCounter != 9999) && (gTacticalStatus.ubTopMessageType != PLAYER_TURN_MESSAGE) && (gTacticalStatus.ubTopMessageType != PLAYER_INTERRUPT_MESSAGE)) { gTacticalStatus.usTactialTurnLimitCounter = SUpdateNetworkSoldier->usTactialTurnLimitCounter; gTacticalStatus.usTactialTurnLimitMax = SUpdateNetworkSoldier->usTactialTurnLimitMax;