Little Alien

- Moved new game settings from ja2.ini to Ja2_Options.ini
- Moved all settings from NewGameSettings.cpp to GameSettings.cpp
- New feature:  Militia movement on strategic map v1.3
- New feature: Automatic reload 
  Press Shift+R in tactical to reload all weapons of your team with magazines from sector inventory



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

Utils/Sound Control.cpp

@@ -19,7 +19,7 @@ UINT32 MIDVOLUME								START_MIDVOLUME;
 UINT32 HIGHVOLUME								START_HIGHVOLUME;
 */
 
-extern UINT32 guiWeaponSoundEffectsVolume;
+//extern UINT32 guiWeaponSoundEffectsVolume;
 
 UINT32	guiSpeechVolume = MIDVOLUME;
 UINT32	guiSoundEffectsVolume = MIDVOLUME;
@@ -453,7 +453,7 @@ UINT32 PlayJA2Sample( UINT32 usNum, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoo
 	}
 	else
 	{
-		spParms.uiVolume = (UINT32)( ( ubVolume / (FLOAT) HIGHVOLUME ) * guiSoundEffectsVolume +.5 ) * (1 + guiWeaponSoundEffectsVolume / 100);
+		spParms.uiVolume = (UINT32)( ( ubVolume / (FLOAT) HIGHVOLUME ) * guiSoundEffectsVolume +.5 ) * (1 + gGameExternalOptions.guiWeaponSoundEffectsVolume / 100);
 	}
 
 	spParms.uiVolume &= 0xFFL;
@@ -474,6 +474,7 @@ UINT32 PlayJA2StreamingSample( UINT32 usNum, UINT32 usRate, UINT32 ubVolume, UIN
 	memset(&spParms, 0xff, sizeof(SOUNDPARMS));
 
 	spParms.uiSpeed = usRate;
+
 	spParms.uiVolume = CalculateSoundEffectsVolume( ubVolume );
 	spParms.uiLoop = ubLoops;
 	spParms.uiPan = uiPan;
@@ -500,7 +501,7 @@ UINT32 PlayJA2SampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, U
 	}
 	else
 	{
-		spParms.uiVolume = (UINT32)( ( ubVolume / (FLOAT) HIGHVOLUME ) * guiSoundEffectsVolume +.5 ) * (1 + guiWeaponSoundEffectsVolume / 100);
+		spParms.uiVolume = (UINT32)( ( ubVolume / (FLOAT) HIGHVOLUME ) * guiSoundEffectsVolume +.5 ) * (1 + gGameExternalOptions.guiWeaponSoundEffectsVolume / 100);
 	}
 	
 	spParms.uiLoop = ubLoops;
@@ -512,7 +513,6 @@ UINT32 PlayJA2SampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, U
 	return(SoundPlay((STR) szFileName, &spParms));
 }
 
-
 UINT32 PlayJA2StreamingSampleFromFile( STR8 szFileName, UINT32 usRate, UINT32 ubVolume, UINT32 ubLoops, UINT32 uiPan, SOUND_STOP_CALLBACK EndsCallback )
 {
 

Utils/Text.h

@@ -158,6 +158,8 @@ extern STR16 wMapScreenSortButtonHelpText[];
 extern STR16 pNewNoiseStr[];
 extern STR16 gzLateLocalizedString[];
 
+extern STR16 gzCWStrings[];
+
 enum
 {
 	ANTIHACKERSTR_EXITGAME,

Utils/_EnglishText.cpp

@@ -3468,8 +3468,10 @@ STR16	zOptionsScreenHelpText[] =
 
 	L"When ON, the movement cursor is shown in 3D. ( |Home )",
 
+	// Options for 1.13
 	L"When ON, the the chance to hit is shown on the cursor.",
-
+	L"GL Burst, i dont know what is it :(",
+	L"Enemy drop all items, when he is dead.",
 };
 
 
@@ -4044,7 +4046,10 @@ STR16 gzLateLocalizedString[] =
 	L"%s fires %d more rounds than intended!"
 };
 
+STR16 gzCWStrings[] = 
+{
+	L"Call reinforcements from adjacent sectors?",
+};
 
 
-
-#endif //ENGLISH
+#endif //ENGLISH

Utils/_GermanText.cpp

@@ -3270,7 +3270,11 @@ STR16 zOptionsScreenHelpText[] =
 	L"ANgeschaltet, werden Drahtgitter für verborgene Wände gezeigt (|W).",
 
 	L"ANgeschaltet, wird der Bewegungs-Cursor in 3D angezeigt. ( |Home )",
-
+	
+	// Options for 1.13
+	L"Die Trefferchance wird beim Cursor angezeigt",
+	L"GL Burst, was auch immer das bedeutet :(",
+	L"Gegner lassen bei ihrem Ableben alle Gegenstände zurück.",
 };
 
 STR16 gzGIOScreenText[] =
@@ -3294,11 +3298,11 @@ STR16 gzGIOScreenText[] =
 	L"Ohne Zeitlimit",
 	L"Mit Zeitlimit",
 	L"Option nicht verfügbar", 
-	L"Bobby Ray's Selection",
-	L"Good",
-	L"Great",
-	L"Excellent",
-	L"Awesome",
+	L"Bobby Ray's Auswahl",
+	L"Normal",
+	L"Groß",
+	L"Ausgezeichnet",
+	L"Fantastisch",
 };
 
 STR16 pDeliveryLocationStrings[] =
@@ -3828,4 +3832,9 @@ STR16 gzLateLocalizedString[] =
 
 };
 
+STR16 gzCWStrings[] = 
+{
+	L"Verstärkung von anliegenden Sektoren anfordern?",
+};
+
 #endif //GERMAN

Utils/_RussianText.cpp

@@ -4011,6 +4011,10 @@ STR16 gzLateLocalizedString[] =
   L"Âûêëþ÷àòåëü íàæàò.",
 };
 
+STR16 gzCWStrings[] = 
+{
+	L"Íóæíà ëè ïîääåðæêà îïîë÷åíèÿ èç ñîñåäíèõ ñåêòîðîâ?",
+};