From 06c9fb60cc702904708df9180ac7585f0a3ed316 Mon Sep 17 00:00:00 2001 From: haydent Date: Mon, 19 May 2008 04:19:34 +0000 Subject: [PATCH] fixed opponent count error git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2183 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Multiplayer/client.cpp | 3 +++ Multiplayer/test_space.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index d466a98f8..580364f44 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -2130,7 +2130,10 @@ void recieveDEATH (RPCParameters *rpcParameters) { pSoldier->usAnimState=50; ScreenMsg( FONT_YELLOW, MSG_CHAT, L"made merc corpse/dead"); + RemoveManAsTarget(pSoldier); TurnSoldierIntoCorpse( pSoldier, TRUE, TRUE ); + + if ( CheckForEndOfBattle( FALSE ) ) { ScreenMsg( FONT_LTGREEN, MSG_CHAT, L"All over red rover..."); diff --git a/Multiplayer/test_space.cpp b/Multiplayer/test_space.cpp index 7e4ce03db..171e278d4 100644 --- a/Multiplayer/test_space.cpp +++ b/Multiplayer/test_space.cpp @@ -113,7 +113,7 @@ void test_func2 (void)//now bound to "0" //currently displays coordinates of the SOLDIERTYPE * pSoldier=MercPtrs[ 0 ]; -pSoldier->ubServicePartner = NOBODY; +RemoveOneOpponent( pSoldier ); //SOLDIERTYPE * pSoldier2=MercPtrs[ 127 ]; // ////pSoldier->AdjustNoAPToFinishMove( TRUE );