- added menu option to allow/disallow crows

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@404 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -256,6 +256,7 @@ void InitGameSettings()
 	gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ]		= TRUE;
 	gGameSettings.fOptions[ TOPTION_TRACERS_FOR_SINGLE_FIRE ]			= FALSE;
 	gGameSettings.fOptions[ TOPTION_RAIN_SOUND ]						= TRUE;
+	gGameSettings.fOptions[ TOPTION_ALLOW_CROWS ]						= TRUE;
 
 	gGameSettings.ubSizeOfDisplayCover = 4;
 	gGameSettings.ubSizeOfLOS = 4;

GameSettings.h

@@ -50,6 +50,7 @@ enum
 	TOPTION_SHOW_WEAPON_RANGE_IN_TILES,
 	TOPTION_TRACERS_FOR_SINGLE_FIRE,
 	TOPTION_RAIN_SOUND,
+	TOPTION_ALLOW_CROWS,
 	NUM_GAME_OPTIONS,				//Toggle up this will be able to be Toggled by the player
 	
 

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.403" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.404" };
 
 
 #endif

Strategic/strategicmap.cpp

@@ -1465,10 +1465,13 @@ BOOLEAN	SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 
 			// Every third turn
 			//if ( Random( 3 ) == 0  )
+			{
+				if(gGameSettings.fOptions[ TOPTION_ALLOW_CROWS ] == TRUE)
 				{
 					gTacticalStatus.fGoodToAllowCrows	= TRUE;
 					gTacticalStatus.ubNumCrowsPossible	= (UINT8)( 5 + Random( 5 ) );
 				}
+			}
 
 		}
 

TileEngine/structure.cpp

@@ -1221,7 +1221,7 @@ STRUCTURE * FindStructure( INT16 sGridNo, UINT32 fFlags )
 { // finds a structure that matches any of the given flags
 	STRUCTURE * pCurrent;
 
-	if( sGridNo > WORLD_MAX-1 ) 
+	if( sGridNo > WORLD_MAX-1 ) //bug fix for win98 crash when traveling between sectors
 		return( NULL );
 
 	pCurrent =  gpWorldLevelData[sGridNo].pStructureHead;

Utils/Utils.vcproj

@@ -3075,9 +3075,6 @@
 			<File
 				RelativePath=".\XML_Strings.cpp">
 			</File>
-			<File
-				RelativePath=".\XML_Strings2.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

Utils/_EnglishText.cpp

@@ -3425,6 +3425,7 @@ STR16		zOptionsToggleText[] =
 	L"Show Weapon Ranges in Tiles",
 	L"Tracer effect for single shot",
 	L"Rain noises",
+	L"Allow crows",
 };
 
 //This is the help text associated with the above toggles.
@@ -3500,6 +3501,7 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, weapon ranges will be shown in tiles.",
 	L"When ON, tracer effect will be shown for single shots.",
 	L"When ON, you will hear rain noises when it is raining.",
+	L"When ON, the crows are present in game.",
 };
 
 

Utils/_GermanText.cpp

@@ -729,9 +729,9 @@ STR16 gzMercSkillText[] =
 	L"Messer",
 	L"Dach-Treffer-Bonus",
 	L"Getarnt",
-	L"Getarnt (Urban)",						
+	L"Getarnt (Stadt)",						
-	L"Getarnt (Desert)",						
+	L"Getarnt (Wüste)",						
-	L"Getarnt (Snow)",						
+	L"Getarnt (Schnee)",						
 	L"(Experte)",
 };
 
@@ -3231,6 +3231,7 @@ STR16 zOptionsToggleText[] =
 	L"Waffenreichweite in Felder",
 	L"Tracereffekte für Einzelschüsse",
 	L"Regengeräusche",
+	L"Krähen erlauben",
 };
 
 //This is the help text associated with the above toggles.
@@ -3306,6 +3307,7 @@ STR16 zOptionsScreenHelpText[] =
 	L"Wenn diese Funktion aktiviert ist, werden Waffenreichweiten in Feldern angezeigt.",
 	L"Wenn diese Funktion aktiviert ist, wird Tracereffekt auch für Einzelschüsse angezeigt.",
 	L"Wenn diese Funktion aktiviert ist, werden Regengeräusche hörbar falls es regnet.",
+	L"Wenn diese Funktion aktiviert ist, sind Krähen im Spiel vorhanden.",
 };
 
 STR16 gzGIOScreenText[] =

Utils/_RussianText.cpp

@@ -3414,6 +3414,7 @@ STR16		zOptionsToggleText[] =
 	L"Show Weapon Ranges in Tiles",
 	L"Tracer effect for single shot",
 	L"Rain noises",
+	L"Allow crows",
 };
 
 //This is the help text associated with the above toggles.
@@ -3489,6 +3490,7 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, weapon ranges will be shown in tiles.",
 	L"When ON, tracer effect will be shown for single shots.",	
 	L"When ON, you will hear rain noises when it is raining.",
+	L"When ON, the crows are present in game.",
 };