Merge branch 'master' into ExtraMercs

Tactical/Civ Quotes.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 #include "builddefines.h"
 #include <stdio.h>
 #include "Types.h"
@@ -32,7 +29,6 @@
 #include "NPC.h"
 #include "Strategic Mines.h"
 #include "Random.h"
-#endif
 #include "connect.h"
 
 // for enemy taunts
@@ -201,42 +197,12 @@ BOOLEAN GetCivQuoteText(UINT16 ubCivQuoteID, UINT16 ubEntryID, STR16 zQuote )
 
 void SurrenderMessageBoxCallBack( UINT8 ubExitValue )
 {
-	SOLDIERTYPE *pTeamSoldier;
-	INT32				cnt = 0;
-
 	if ( ubExitValue == MSG_BOX_RETURN_YES )
 	{
-		// CJC Dec 1 2002: fix multiple captures
-		BeginCaptureSquence();
-
-	// Do capture....
-		cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
-
-		for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++,pTeamSoldier++)
-		{
-			// Are we active and in sector.....
-			if ( pTeamSoldier->bActive && pTeamSoldier->bInSector )
-			{
-				if ( pTeamSoldier->stats.bLife != 0 )
-				{
-					EnemyCapturesPlayerSoldier( pTeamSoldier );
-
-					RemoveSoldierFromTacticalSector( pTeamSoldier, TRUE );
-				}
-			}
-		}
-
-		EndCaptureSequence( );
-
-		gfSurrendered = TRUE;
-		SetCustomizableTimerCallbackAndDelay( 3000, CaptureTimerCallback, FALSE );
-
-		ActionDone( gCivQuoteData.pCiv );
-	}
-	else
-	{
-		ActionDone( gCivQuoteData.pCiv );
+		AttemptToCapturePlayerSoldiers();
 	}
+	gTacticalStatus.fEnemyFlags |= ENEMY_OFFERED_SURRENDER;
+	ActionDone( gCivQuoteData.pCiv );
 }
 
 void ShutDownQuoteBox( BOOLEAN fForce )
@@ -2388,4 +2354,4 @@ BOOLEAN PlayVoiceTaunt(SOLDIERTYPE *pCiv, TAUNTTYPE iTauntType, SOLDIERTYPE *pTa
 	}
 
 	return TRUE;
-}
+}