From 85252909ffa68dad620e35635c132458159fdde4 Mon Sep 17 00:00:00 2001 From: haydent Date: Tue, 20 May 2008 00:49:45 +0000 Subject: [PATCH] mp fixes some more git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2187 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Multiplayer/client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 213c66ba..14e416dd 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -2051,7 +2051,7 @@ void recieveSTATE(RPCParameters *rpcParameters) pSoldier->EVENT_SetSoldierDirection( new_state->usNewDirection ); } - if(new_state->usNewState==95)ScreenMsg( FONT_YELLOW, MSG_CHAT, L"All Bandaged."); + //if(new_state->usNewState==95)ScreenMsg( FONT_YELLOW, MSG_CHAT, L"All Bandaged."); pSoldier->EVENT_InitNewSoldierAnim( new_state->usNewState, new_state->usStartingAniCode, new_state->fForce ); } @@ -2316,7 +2316,7 @@ void UpdateSoldierToNetwork ( SOLDIERTYPE *pSoldier ) SUpdateNetworkSoldier.bLife=pSoldier->stats.bLife; SUpdateNetworkSoldier.bBleeding=pSoldier->bBleeding; - SUpdateNetworkSoldier.ubNewStance=pSoldier->ubDesiredHeight; + SUpdateNetworkSoldier.ubNewStance= gAnimControl[ pSoldier->usAnimState ].ubEndHeight; if((gTacticalStatus.ubTopMessageType == PLAYER_TURN_MESSAGE || gTacticalStatus.ubTopMessageType == PLAYER_INTERRUPT_MESSAGE || ((gTacticalStatus.ubTopMessageType == COMPUTER_INTERRUPT_MESSAGE || gTacticalStatus.ubTopMessageType == COMPUTER_TURN_MESSAGE )&& is_server)) && (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT))//update progress bar, not supporting coop yet... @@ -2360,7 +2360,7 @@ void UpdateSoldierFromNetwork (RPCParameters *rpcParameters) pSoldier->EVENT_SetSoldierDesiredDirection( SUpdateNetworkSoldier->ubDirection ); //ScreenMsg( FONT_LTBLUE, MSG_CHAT, L"sync ubid:%d dir %d to %d",pSoldier->ubID, pSoldier->ubDirection, SUpdateNetworkSoldier->ubDirection ); } - if(pSoldier->ubDesiredHeight != SUpdateNetworkSoldier->ubNewStance && pSoldier->bCollapsed != TRUE) + if(gAnimControl[ pSoldier->usAnimState ].ubEndHeight != SUpdateNetworkSoldier->ubNewStance && pSoldier->bCollapsed != TRUE) { pSoldier->ChangeSoldierStance( SUpdateNetworkSoldier->ubNewStance ); //ScreenMsg( FONT_LTBLUE, MSG_CHAT, L"update stance");