From f22265468a3367995cfd7f1bffadc1c21345e893 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 2 Oct 2012 07:38:38 +0000 Subject: [PATCH] - MP: Bugfix: client wasnt getting update via turn bar that server got interrupt (by haydent) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5600 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Multiplayer/client.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 7e595c0d..e61ef48e 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -1918,7 +1918,7 @@ void recieveINTERRUPT (RPCParameters *rpcParameters) INT_STRUCT* INT = (INT_STRUCT*)rpcParameters->input; SOLDIERTYPE* pOpponent = MercPtrs[ INT->Interrupted]; - if(INT->bTeam==netbTeam)//for us or AI + if(INT->bTeam==netbTeam)//for us or AI //im not sure about this comment. i think this if check only if its for us... - hayden { INT->bTeam=0; INT->ubID=INT->ubID - ubID_prefix; @@ -1945,7 +1945,7 @@ void recieveINTERRUPT (RPCParameters *rpcParameters) } // WANNE - MP: This seems to cause the HANG on AI interrupt where we have to press ALT + E on the server! - if( INT->bTeam != 0) + if( INT->bTeam != 0)//not for our team - hayden { ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, MPClientMessage[17] ); //stop moving merc who was interrupted and init UI bar @@ -1955,6 +1955,9 @@ void recieveINTERRUPT (RPCParameters *rpcParameters) InitEnemyUIBar( 0, 0 ); fInterfacePanelDirty = DIRTYLEVEL2; gTacticalStatus.fInterruptOccurred = TRUE; + + AddTopMessage( COMPUTER_INTERRUPT_MESSAGE, TeamTurnString[ INT->bTeam ] ); + //this needed to add details of who's interrupt it is - hayden } else {