From 43b6e98496029b691a9c521df6277ee67fb4dbeb Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 10 Jul 2006 18:53:19 +0000
Subject: [PATCH] - added menu option to enable tracer effect for single shots

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

diff --git a/GameSettings.cpp b/GameSettings.cpp
index 2f29c08df..eefeb13cd 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -254,6 +254,7 @@ void InitGameSettings()
 	gGameSettings.fOptions[ TOPTION_SPACE_SELECTS_NEXT_SQUAD ]			= TRUE;
 	gGameSettings.fOptions[ TOPTION_SHOW_ITEM_SHADOW ]					= TRUE;
 	gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ]		= TRUE;
+	gGameSettings.fOptions[ TOPTION_TRACERS_FOR_SINGLE_FIRE ]			= FALSE;
 
 	gGameSettings.ubSizeOfDisplayCover = 4;
 	gGameSettings.ubSizeOfLOS = 4;
diff --git a/GameSettings.h b/GameSettings.h
index e4bbc35ec..ec83bebad 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -48,6 +48,7 @@ enum
 	TOPTION_SPACE_SELECTS_NEXT_SQUAD,
 	TOPTION_SHOW_ITEM_SHADOW,
 	TOPTION_SHOW_WEAPON_RANGE_IN_TILES,
+	TOPTION_TRACERS_FOR_SINGLE_FIRE,
 	NUM_GAME_OPTIONS,				//Toggle up this will be able to be Toggled by the player
 
 	//These options will NOT be toggable by the Player
diff --git a/GameVersion.cpp b/GameVersion.cpp
index c52962a75..bb3356a11 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.338" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.340" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index c7f629e68..8fc66d84a 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 v1.13\ja2_debug_v1.13.329_2006_07_06.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.340_2006_07_10.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.329_2006_07_05.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.340_2006_07_10.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp
index b9a0370e3..c735e637e 100644
--- a/Tactical/LOS.cpp
+++ b/Tactical/LOS.cpp
@@ -3534,7 +3534,7 @@ INT8 FireBulletGivenTarget( SOLDIERTYPE * pFirer, FLOAT dEndX, FLOAT dEndY, FLOA
 		usBulletFlags |= BULLET_FLAG_FLAME;
 		ubSpreadIndex = 2;
 	}
-	else if ( AmmoTypes[ pFirer->inv[pFirer->ubAttackingHand].ubGunAmmoType ].tracerEffect && pFirer->bDoBurst )
+	else if ( AmmoTypes[ pFirer->inv[pFirer->ubAttackingHand].ubGunAmmoType ].tracerEffect && (pFirer->bDoBurst || gGameSettings.fOptions[ TOPTION_TRACERS_FOR_SINGLE_FIRE ]) )
 	{
 		usBulletFlags |= BULLET_FLAG_TRACER;
 	}
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 0501ee2b9..4a42ae7a2 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -3420,6 +3420,7 @@ STR16		zOptionsToggleText[] =
 	L"Space selects next Squad",
 	L"Show Item Shadow",
 	L"Show Weapon Ranges in Tiles",
+	L"Tracer effect for single shot",
 };
 
 //This is the help text associated with the above toggles.
@@ -3493,6 +3494,7 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, |S|p|a|c|e selects next squad automatically.",
 	L"When ON, item shadows will be shown.",
 	L"When ON, weapon ranges will be shown in tiles.",
+	L"When ON, tracer effect will be shown for single shots.",
 };
 
 
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index 0d4fc5ba5..03628cfd4 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -3226,6 +3226,7 @@ STR16 zOptionsToggleText[] =
 	L"Nächste Gruppe selektieren",
 	L"Gegenstände mit Schatten",
 	L"Waffenreichweite in Felder",
+	L"Tracereffekte für Einzelschüsse",
 };
 
 //This is the help text associated with the above toggles.
@@ -3299,6 +3300,7 @@ STR16 zOptionsScreenHelpText[] =
 	L"ANgeschaltet, selektiert |S|p|a|c|e automatisch die nächste Gruppe.",
 	L"Wenn diese Funktion aktiviert ist, wird der Schatten von Gegenständen angezeigt.",
 	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.",
 };
 
 STR16 gzGIOScreenText[] =
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 787812c57..d14d42281 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -3409,6 +3409,7 @@ STR16		zOptionsToggleText[] =
 	L"Space selects next Squad",
 	L"Show Item Shadow",
 	L"Show Weapon Ranges in Tiles",
+	L"Tracer effect for single shot",
 };
 
 //This is the help text associated with the above toggles.
@@ -3482,6 +3483,7 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, |S|p|a|c|e selects next squad automatically.",
 	L"When ON, item shadows will be shown.",
 	L"When ON, weapon ranges will be shown in tiles.",
+	L"When ON, tracer effect will be shown for single shots.",	
 };