1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rain noise can be toggled ON/OFF in the Options Screen

Browse Source 
Added Brightness Level string to the German Version, when pressing "F" in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-07-21 21:09:50 +00:00
parent e146163d84
commit b6df04a08a
14 changed files with 132 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1
View File
@@ -255,6 +255,7 @@ void InitGameSettings()
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.fOptions[ TOPTION_RAIN_SOUND ] = TRUE;
gGameSettings.ubSizeOfDisplayCover = 4;
gGameSettings.ubSizeOfLOS = 4;
GameSettings.h
+2
View File
@@ -49,7 +49,9 @@ enum
TOPTION_SHOW_ITEM_SHADOW,
TOPTION_SHOW_WEAPON_RANGE_IN_TILES,
TOPTION_TRACERS_FOR_SINGLE_FIRE,
TOPTION_RAIN_SOUND,
NUM_GAME_OPTIONS, //Toggle up this will be able to be Toggled by the player
//These options will NOT be toggable by the Player
TOPTION_MERC_CASTS_LIGHT = NUM_GAME_OPTIONS,
JA2.suo
BIN
View File
Binary file not shown.
JA2.vcproj
+1 -1
View File
@@ -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.348_2006_07_17.exe"
OutputFile="C:\Games\Jagged Alliance 2 DE\ja2_debug_v1.13.348_2006_07_17.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
TileEngine/environment.cpp
+24 -11
View File
@@ -179,10 +179,13 @@ void EnvironmentController( BOOLEAN fCheckForLights )
guiEnvWeather &= (~WEATHER_FORECAST_THUNDERSHOWERS );
guiEnvWeather &= (~WEATHER_FORECAST_SHOWERS );
if ( guiRainLoop != NO_SAMPLE )
if (gGameSettings.fOptions[ TOPTION_RAIN_SOUND ] == TRUE)
{
SoundStop( guiRainLoop );
guiRainLoop = NO_SAMPLE;
if ( guiRainLoop != NO_SAMPLE )
{
SoundStop( guiRainLoop );
guiRainLoop = NO_SAMPLE;
}
}
return;
}
@@ -208,9 +211,13 @@ void EnvironmentController( BOOLEAN fCheckForLights )
//#if 0 //rain
if ( guiEnvWeather & ( WEATHER_FORECAST_THUNDERSHOWERS | WEATHER_FORECAST_SHOWERS ) )
{
if ( guiRainLoop == NO_SAMPLE )
if (gGameSettings.fOptions[ TOPTION_RAIN_SOUND ] == TRUE)
{
guiRainLoop = PlayJA2Ambient( RAIN_1, BTNVOLUME, 0 );
if ( guiRainLoop == NO_SAMPLE )
{
guiRainLoop = PlayJA2Ambient( RAIN_1, BTNVOLUME, 0 );
}
}
// Do lightning if we want...
@@ -222,10 +229,13 @@ void EnvironmentController( BOOLEAN fCheckForLights )
}
else
{
if ( guiRainLoop != NO_SAMPLE )
if (gGameSettings.fOptions[ TOPTION_RAIN_SOUND ] == TRUE)
{
SoundStop( guiRainLoop );
guiRainLoop = NO_SAMPLE;
if ( guiRainLoop != NO_SAMPLE )
{
SoundStop( guiRainLoop );
guiRainLoop = NO_SAMPLE;
}
}
}
//#endif //rain
@@ -362,10 +372,13 @@ void BuildDayAmbientSounds( )
//guiRainLoop = NO_SAMPLE;
//rain
if ( guiRainLoop != NO_SAMPLE )
if (gGameSettings.fOptions[ TOPTION_RAIN_SOUND ] == TRUE)
{
SoundStop( guiRainLoop );
guiRainLoop = NO_SAMPLE;
if ( guiRainLoop != NO_SAMPLE )
{
SoundStop( guiRainLoop );
guiRainLoop = NO_SAMPLE;
}
}
//end rain
}
Utils/_DutchText.cpp
+22
View File
@@ -3410,6 +3410,16 @@ STR16 zOptionsToggleText[] =
L"Toon Boomtoppen",
L"Toon Draadmodellen",
L"Toon 3D Cursor",
L"Show Chance to Hit on cursor",
L"GL Burst uses Burst cursor",
L"Enemies Drop all Items",
L"High angle Grenade launching",
L"Restrict extra Aim Levels",
L"Space selects next Squad",
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
};
//This is the help text associated with the above toggles.
@@ -3474,6 +3484,18 @@ STR16 zOptionsScreenHelpText[] =
L"Wanneer INGESCHAKELD wordt de cursor in 3D getoond. (|Home)",
// Options for 1.13
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, dead enemies drop all items.",
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, aim levels beyond 4 are restricted to rifles and sniper rifles.",
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.",
L"When ON, rain noises will be activated.",
};
Utils/_EnglishText.cpp
+3 -1
View File
@@ -3421,6 +3421,7 @@ STR16 zOptionsToggleText[] =
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
};
//This is the help text associated with the above toggles.
@@ -3489,12 +3490,13 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, dead enemies drop all items.",
L"When ON, grenade launchers fire grenades at higher angles.",
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, aim levels beyond 4 are restricted to rifles and sniper rifles.",
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.",
L"When ON, rain noises will be activated.",
};
Utils/_FrenchText.cpp
+22
View File
@@ -3399,6 +3399,16 @@ STR16 zOptionsToggleText[] =
L"Afficher cimes",
L"Affichage fil de fer",
L"Curseur 3D",
L"Show Chance to Hit on cursor",
L"GL Burst uses Burst cursor",
L"Enemies Drop all Items",
L"High angle Grenade launching",
L"Restrict extra Aim Levels",
L"Space selects next Squad",
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
};
//This is the help text associated with the above toggles.
@@ -3463,6 +3473,18 @@ STR16 zOptionsScreenHelpText[] =
L"Activez cette option pour afficher le curseur en 3D. ( |Home )",
// Options for 1.13
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, dead enemies drop all items.",
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, aim levels beyond 4 are restricted to rifles and sniper rifles.",
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.",
L"When ON, rain noises will be activated.",
};
Utils/_GermanText.cpp
+7 -5
View File
@@ -3227,6 +3227,7 @@ STR16 zOptionsToggleText[] =
L"Gegenstände mit Schatten",
L"Waffenreichweite in Felder",
L"Tracereffekte für Einzelschüsse",
L"Regengeräusche",
};
//This is the help text associated with the above toggles.
@@ -3292,15 +3293,16 @@ STR16 zOptionsScreenHelpText[] =
L"ANgeschaltet, wird der Bewegungs-Cursor in 3D angezeigt. ( |Home )",
// Options for 1.13
L"Diese Funktion ANschalten, wenn die Trefferwahrscheinlichkeit am Cursor angezeigt werden soll.",
L"Wenn diese Funktion aktiviert ist, wird die Trefferwahrscheinlichkeit am Cursor angezeigt.",
L"Wenn diese Funktion aktiviert ist, wird für einen GL Burst der Burst Cursor angezeigt.",
L"ANgeschaltet, lassen tote Gegner alle Gegenstände zurück am Boden.",
L"Wenn diese Funktion aktiviert ist, können Granatwerfer Granaten in höherem Winkel abfeuern.",
L"Wenn diese Funktion aktiviert ist, wird eine Zielgenauigkeit über 4 auf Gewehre und Scharfschützengewehre eingeschränkt.",
L"ANgeschaltet, selektiert |S|p|a|c|e automatisch die nächste Gruppe.",
L"Wenn diese Funktion aktiviert ist, lassen tote Gegner alle Gegenstände zurück am Boden.",
L"Wenn diese Funktion aktiviert ist, können Granatwerfer Granaten in höherem Winkel abfeuern (|Q).",
L"Wenn diese Funktion aktiviert ist, kann die Zielgenauigkeit von Gewehre und Scharfschützengewehre über 4 gesteigert werden.",
L"Wenn diese Funktion aktiviert ist, 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.",
L"Wenn diese Funktion aktiviert ist, werden Regengeräusche hörbar.",
};
STR16 gzGIOScreenText[] =
Utils/_ItalianText.cpp
+22
View File
@@ -3392,6 +3392,16 @@ STR16 zOptionsToggleText[] =
L"Mostra le fronde degli alberi",
L"Mostra strutture",
L"Mostra il cursore 3D",
L"Show Chance to Hit on cursor",
L"GL Burst uses Burst cursor",
L"Enemies Drop all Items",
L"High angle Grenade launching",
L"Restrict extra Aim Levels",
L"Space selects next Squad",
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
};
//This is the help text associated with the above toggles.
@@ -3456,6 +3466,18 @@ STR16 zOptionsScreenHelpText[] =
L"Se attivata, il cursore di movimento verrà mostrato in 3D (|Home).",
// Options for 1.13
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, dead enemies drop all items.",
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, aim levels beyond 4 are restricted to rifles and sniper rifles.",
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.",
L"When ON, rain noises will be activated.",
};
Utils/_Ja25GermanText.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
STR16 zNewTacticalMessages[]=
{
L"Entfernung zum Ziel: %d Felder",
L"Entfernung zum Ziel: %d Felder, Helligkeit = %d/%d",
L"Verbinden Sie den Transmitter mit Ihrem Laptop-Computer.",
L"Sie haben nicht genug Geld, um %s anzuheuern",
L"Das obenstehende Honorar deckt für einen begrenzten Zeitraum die Kosten der Gesamtmission, und schließt untenstehendes Equipment mit ein.",
Utils/_Ja25GermanText.h
+2 -1
View File
@@ -11,7 +11,8 @@ enum
TACT_MSG__AIMMEMBER_ONE_TIME_FEE,
TACT_MSG__FEE,
TACT_MSG__SOMEONE_ELSE_IN_SECTOR,
TCTL_MSG__RANGE_TO_TARGET_AND_GUN_RANGE,
TCTL_MSG__GUN_RANGE_AND_CTH,
//TCTL_MSG__RANGE_TO_TARGET_AND_GUN_RANGE, // WANNE
TCTL_MSG__DISPLAY_COVER,
TCTL_MSG__LOS,
TCTL_MSG__INVALID_DROPOFF_SECTOR,
Utils/_PolishText.cpp
+22
View File
@@ -3392,6 +3392,16 @@ STR16 zOptionsToggleText[] =
L"Pokazuj korony drzew",
L"Pokazuj siatkê",
L"Pokazuj kursor 3D",
L"Show Chance to Hit on cursor",
L"GL Burst uses Burst cursor",
L"Enemies Drop all Items",
L"High angle Grenade launching",
L"Restrict extra Aim Levels",
L"Space selects next Squad",
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
};
//This is the help text associated with the above toggles.
@@ -3456,6 +3466,18 @@ STR16 zOptionsScreenHelpText[] =
L"Gdy opcja ta jest w³¹czona, kursor ruchu wyœwietlany jest w 3D. ( |Home )",
// Options for 1.13
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, dead enemies drop all items.",
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, aim levels beyond 4 are restricted to rifles and sniper rifles.",
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.",
L"When ON, rain noises will be activated.",
};
Utils/_RussianText.cpp
+3 -1
View File
@@ -3410,6 +3410,7 @@ STR16 zOptionsToggleText[] =
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
};
//This is the help text associated with the above toggles.
@@ -3478,12 +3479,13 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, dead enemies drop all items.",
L"When ON, grenade launchers fire grenades at higher angles.",
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, aim levels beyond 4 are restricted to rifles and sniper rifles.",
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.",
L"When ON, rain noises will be activated.",
};