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
This commit is contained in:
lalien
2008-05-12 08:35:50 +00:00
parent 3e22dce318
commit c789c1953f
+1 -1
View File
@@ -2311,7 +2311,7 @@ void UpdateSoldierFromNetwork (RPCParameters *rpcParameters)
pSoldier->bBleeding=SUpdateNetworkSoldier->bBleeding; 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.usTactialTurnLimitCounter = SUpdateNetworkSoldier->usTactialTurnLimitCounter;
gTacticalStatus.usTactialTurnLimitMax = SUpdateNetworkSoldier->usTactialTurnLimitMax; gTacticalStatus.usTactialTurnLimitMax = SUpdateNetworkSoldier->usTactialTurnLimitMax;