1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MP: Bugfix: client wasnt getting update via turn bar that server got interrupt (by haydent)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-10-02 07:38:38 +00:00
parent 7a81a212a9
commit f22265468a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+5 -2
View File
@@ -1918,7 +1918,7 @@ void recieveINTERRUPT (RPCParameters *rpcParameters)
INT_STRUCT* INT = (INT_STRUCT*)rpcParameters->input; INT_STRUCT* INT = (INT_STRUCT*)rpcParameters->input;
SOLDIERTYPE* pOpponent = MercPtrs[ INT->Interrupted]; 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->bTeam=0;
INT->ubID=INT->ubID - ubID_prefix; 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! // 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] ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, MPClientMessage[17] );
//stop moving merc who was interrupted and init UI bar //stop moving merc who was interrupted and init UI bar
@@ -1955,6 +1955,9 @@ void recieveINTERRUPT (RPCParameters *rpcParameters)
InitEnemyUIBar( 0, 0 ); InitEnemyUIBar( 0, 0 );
fInterfacePanelDirty = DIRTYLEVEL2; fInterfacePanelDirty = DIRTYLEVEL2;
gTacticalStatus.fInterruptOccurred = TRUE; gTacticalStatus.fInterruptOccurred = TRUE;
AddTopMessage( COMPUTER_INTERRUPT_MESSAGE, TeamTurnString[ INT->bTeam ] );
//this needed to add details of who's interrupt it is - hayden
} }
else else
{ {