From cde29c1388f032da018184f06c136398f8049edb Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 1 May 2013 10:42:55 +0000 Subject: [PATCH] - MP: Removed wrong "#ifdef INTERRUPT_MP_DEADLOCK_FIX" git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6045 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Multiplayer/client.cpp | 3 --- Multiplayer/connect.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 247d68d6..d1881e08 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -2052,9 +2052,6 @@ void send_interrupt (SOLDIERTYPE *pSoldier) fInterfacePanelDirty = DIRTYLEVEL2; gTacticalStatus.fInterruptOccurred = TRUE; -#ifdef INTERRUPT_MP_DEADLOCK_FIX - AddTopMessage( COMPUTER_INTERRUPT_MESSAGE, TeamTurnString[ INT->bTeam ] ); -#endif //this needed to add details of who's interrupt it is - hayden ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Interrupt with %s awarded to %s.", TeamNameStrings[pOpponent->bTeam], TeamNameStrings[INT->bTeam] );//was MPClientMessage[17], can be reconnected if text updated and translated } diff --git a/Multiplayer/connect.h b/Multiplayer/connect.h index 5c4363d7..f9fd34ff 100644 --- a/Multiplayer/connect.h +++ b/Multiplayer/connect.h @@ -148,7 +148,7 @@ extern char cServerName[30]; //OJW - 20081224 #define MAX_CONNECT_RETRIES 5 -// WANNE: After some MP-Tests: It seems there are still problems with enemy interupt and if this define is enabled the ALT + E (give turn to client) does not work correctly. So I disabled this define for now ... +// WANNE: After some MP-Tests: It seems there are still problems with enemy interupt and if this define is enabled the ALT + E (give turn to client) does not work either. So I disabled this define for now ... // WANNE: If this define is enabled, it hopefully fixes the "enemy AI got stuck on pure client interrupt". (this "fix" was added in revision 5623) //#define INTERRUPT_MP_DEADLOCK_FIX