From 3a31632fbe3982ad7e743209a0805d758648b143 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 21 Jun 2006 17:37:50 +0000
Subject: [PATCH] -removed unlimited troops and queen aggression settings from
 savegames

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/Strategic AI.cpp | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp
index 6f7cc3ed6..03ab50706 100644
--- a/Strategic/Strategic AI.cpp	
+++ b/Strategic/Strategic AI.cpp	
@@ -3086,12 +3086,6 @@ BOOLEAN SaveStrategicAI( HWFILE hFile )
 	if( uiNumBytesWritten != 3 )
 		return FALSE;
 	FileWrite( hFile, &gfExtraElites,					1, &uiNumBytesWritten );
-	if( uiNumBytesWritten != 1 )
-		return FALSE;
-	FileWrite( hFile, &gfAggressiveQueen,					1, &uiNumBytesWritten );
-	if( uiNumBytesWritten != 1 )
-		return FALSE;
-	FileWrite( hFile, &gfUnlimitedTroops,					1, &uiNumBytesWritten );
 	if( uiNumBytesWritten != 1 )
 		return FALSE;
 	FileWrite( hFile, &giGarrisonArraySize,		4, &uiNumBytesWritten );
@@ -3215,17 +3209,32 @@ BOOLEAN LoadStrategicAI( HWFILE hFile )
 	INT32 i;
 	UINT8 ubSAIVersion;
 	INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize;
-DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic6");
+
+	switch( gGameOptions.ubDifficultyLevel )
+	{
+		case DIF_LEVEL_EASY:
+			gfUnlimitedTroops		= gGameExternalOptions.gfEasyUnlimitedTroops;
+			gfAggressiveQueen		= gGameExternalOptions.gfEasyAggressiveQueen;
+			break;
+		case DIF_LEVEL_MEDIUM:
+			gfUnlimitedTroops		= gGameExternalOptions.gfNormalUnlimitedTroops;
+			gfAggressiveQueen		= gGameExternalOptions.gfNormalAggressiveQueen;
+			break;
+		case DIF_LEVEL_HARD:
+			gfUnlimitedTroops		= gGameExternalOptions.gfHardUnlimitedTroops;
+			gfAggressiveQueen		= gGameExternalOptions.gfHardAggressiveQueen;
+			break;
+		case DIF_LEVEL_INSANE:
+			gfUnlimitedTroops		= gGameExternalOptions.gfInsaneUnlimitedTroops;
+			gfAggressiveQueen		= gGameExternalOptions.gfInsaneAggressiveQueen;
+			break;
+	}
+
+	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic6");
 	FileRead( hFile, gbPadding2,							3, &uiNumBytesRead );
 	if( uiNumBytesRead != 3 )
 		return FALSE;
 	FileRead( hFile, &gfExtraElites,					1, &uiNumBytesRead );
-	if( uiNumBytesRead != 1 )
-		return FALSE;
-	FileRead( hFile, &gfAggressiveQueen,					1, &uiNumBytesRead );
-	if( uiNumBytesRead != 1 )
-		return FALSE;
-	FileRead( hFile, &gfUnlimitedTroops,					1, &uiNumBytesRead );
 	if( uiNumBytesRead != 1 )
 		return FALSE;
 	FileRead( hFile, &giGarrisonArraySize,		4, &uiNumBytesRead );