From d091bb09f19016df61524974e04d87431e6ee2ed Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 2 Jul 2006 22:44:43 +0000
Subject: [PATCH] - option menu descriptions changed - bug fix: CTD in
 SendReinforcementsForGarrison. Happens in strategic map when a (maybe too
 large?) group of enemies wants to retake a city sector.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp            |  2 +-
 JA2.vcproj                 |  4 ++--
 Strategic/Strategic AI.cpp | 12 ++++++------
 Utils/_EnglishText.cpp     |  2 +-
 Utils/_GermanText.cpp      |  2 +-
 Utils/_RussianText.cpp     |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 3a5ed219..8930ea72 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,7 +23,7 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.321" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.325" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index cecd5225..14512fb5 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 DE\ja2_debug_v1.13.321_2006_07_02.exe"
+				OutputFile="C:\games\Jagged Alliance 2 DE\ja2_debug_v1.13.325_2006_07_02.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.321_2006_07_02.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.325_2006_07_02.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp
index 5573c7d1..bbac12d5 100644
--- a/Strategic/Strategic AI.cpp	
+++ b/Strategic/Strategic AI.cpp	
@@ -2701,12 +2701,12 @@ void SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoints
 			//The force is strong enough to be able to take the sector.
 			gubGarrisonReinforcementsDenied[ iDstGarrisonID ] = 0;
 		}
-
+		
 		//The chance she will send them is related with the strength difference between the
 		//player's force and the queen's.
 		if( ubNumExtraReinforcements && fLimitMaxTroopsAllowable && iReinforcementsApproved == iMaxReinforcementsAllowed )
-		{
-			iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / usDefencePoints;
+		{			
+			iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / max(usDefencePoints, 1); // lal bugfix: max 1 added to prevent division by 0
 			if( !Chance( iChance ) )
 			{
 				ValidateWeights( 13 );
@@ -2789,8 +2789,8 @@ void SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoints
 			//The chance she will send them is related with the strength difference between the
 			//player's force and the queen's.
 			if( iReinforcementsApproved + ubNumExtraReinforcements == iMaxReinforcementsAllowed && usDefencePoints )
-			{
-				iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / usDefencePoints;
+			{				
+				iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / max(usDefencePoints, 1); // lal bugfix: max 1 added to prevent division by 0
 				if( !Chance( iChance ) )
 				{
 					ValidateWeights( 18 );
@@ -3946,9 +3946,9 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 	GROUP *pGroup, *pGroup0, *pGroup1, *pGroup2, *pGroup3, *pPendingGroup = NULL;
 	SECTORINFO *pSector;
 	UINT8 ubSectorID;
-	UINT8 ubNumSoldiers;
 	UINT8 ubSourceSectorID;
 	UINT8 ubTargetSectorID;
+	UINT8 ubNumSoldiers;
 
 	switch( usActionCode )
 	{
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 018220ff..3bda77a5 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -3417,7 +3417,7 @@ STR16		zOptionsToggleText[] =
 	L"Enemies Drop all Items",
 	L"High angle Grenade launching",
 	L"Restrict extra Aim Levels",
-	L"Select next Squad",
+	L"Space selects next Squad",
 	L"Show Item Shadow",
 	L"Show Weapon Ranges in Tiles",
 };
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index 0735da47..0d4fc5ba 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -3224,7 +3224,7 @@ STR16 zOptionsToggleText[] =
 	L"Granatwerferflugbahn erhöhen",
 	L"Extra Zielgenauigkeit",
 	L"Nächste Gruppe selektieren",
-	L"Gegenständen mit Schatten",
+	L"Gegenstände mit Schatten",
 	L"Waffenreichweite in Felder",
 };
 
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index c9660af9..787812c5 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -3406,7 +3406,7 @@ STR16		zOptionsToggleText[] =
 	L"Enemies Drop all Items",
 	L"High angle Grenade launching",
 	L"Restrict extra Aim Levels",
-	L"Select next Squad",
+	L"Space selects next Squad",
 	L"Show Item Shadow",
 	L"Show Weapon Ranges in Tiles",
 };