1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Moved the new cover properties to section "JA2 Tactical Section"

Browse Source 
- Updated texts for new cover system
- Updated build number to 3274
- New exe release build: 3274

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-10-21 13:27:41 +00:00
parent defc028a14
commit a98eda12a5
13 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+13 -10
View File
@@ -735,6 +735,18 @@ void LoadGameExternalOptions()
// Silence the RT sneaking messages // Silence the RT sneaking messages
gGameExternalOptions.fQuietRealTimeSneak = iniReader.ReadBoolean("JA2 Tactical Settings","QUIET_REAL_TIME_SNEAK", FALSE); gGameExternalOptions.fQuietRealTimeSneak = iniReader.ReadBoolean("JA2 Tactical Settings","QUIET_REAL_TIME_SNEAK", FALSE);
// CPT: Cover System Settings
gGameExternalOptions.ubStealthTraitCoverValue = iniReader.ReadInteger("JA2 Tactical Settings","STEALTH_TRAIT_COVER_VALUE", 15, 0, 100);
gGameExternalOptions.ubStealthEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STEALTH_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubTreeCoverEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings","TREE_COVER_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCamouflageEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "CAMOUFLAGE_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCoverDisplayUpdateWait = iniReader.ReadInteger("JA2 Tactical Settings", "COVER_DISPLAY_UPDATE_WAIT", 500, -1, 10000);
gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "LBE_SIGHT_ADJUSTMENT", TRUE);
//################# Rain Settings ################## //################# Rain Settings ##################
// Rain settings // Rain settings
@@ -1006,16 +1018,7 @@ void LoadGameExternalOptions()
// HEADROCK HAM B2.4 // HEADROCK HAM B2.4
gGameExternalOptions.iMineIncomePercentage = iniReader.ReadInteger("JA2 HAM Settings","MINE_INCOME_PERCENTAGE", 100, 1, 1000); gGameExternalOptions.iMineIncomePercentage = iniReader.ReadInteger("JA2 HAM Settings","MINE_INCOME_PERCENTAGE", 100, 1, 1000);
// CPT: Cover System Settings
gGameExternalOptions.ubStealthTraitCoverValue = iniReader.ReadInteger("JA2 Gameplay Settings","STEALTH_TRAIT_COVER_VALUE", 15, 0, 100);
gGameExternalOptions.ubStealthEffectiveness = iniReader.ReadInteger("JA2 Gameplay Settings", "STEALTH_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubTreeCoverEffectiveness = iniReader.ReadInteger("JA2 Gameplay Settings","TREE_COVER_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCamouflageEffectiveness = iniReader.ReadInteger("JA2 Gameplay Settings", "CAMOUFLAGE_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCoverDisplayUpdateWait = iniReader.ReadInteger("JA2 Gameplay Settings", "COVER_DISPLAY_UPDATE_WAIT", 500, -1, 10000);
gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Gameplay Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Gameplay Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Gameplay Settings", "LBE_SIGHT_ADJUSTMENT", TRUE);
// HEADROCK HAM B1: Set minimum and maximum CTH // HEADROCK HAM B1: Set minimum and maximum CTH
gGameExternalOptions.iMaximumCTH = iniReader.ReadInteger("JA2 HAM Settings","MAXIMUM_POSSIBLE_CTH",99); gGameExternalOptions.iMaximumCTH = iniReader.ReadInteger("JA2 HAM Settings","MAXIMUM_POSSIBLE_CTH",99);
GameVersion.cpp
+3 -3
View File
@@ -18,7 +18,7 @@ CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.3023" };
#elif defined JA2BETAVERSION #elif defined JA2BETAVERSION
//BETA/TEST BUILD VERSION //BETA/TEST BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Debug v1.13.3272" }; CHAR16 zVersionLabel[256] = { L"Debug v1.13.3274" };
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Release v1.13.3272" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.3274" };
#endif #endif
CHAR8 czVersionNumber[16] = { "Build 09.10.19" }; //YY.MM.DD CHAR8 czVersionNumber[16] = { "Build 09.10.21" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zTrackingNumber[16] = { L"Z" };
TileEngine/Buildings.cpp
+3 -1
View File
@@ -288,7 +288,7 @@ INT32 iLoopCount = 0;
{ {
bSkipSpots--; bSkipSpots--;
} }
else if ( Random( uiChanceIn ) == 0 ) else /*if ( Random( uiChanceIn ) == 0 )*/
{ {
pBuilding->sUpClimbSpots[ pBuilding->ubNumClimbSpots ] = sCurrGridNo; pBuilding->sUpClimbSpots[ pBuilding->ubNumClimbSpots ] = sCurrGridNo;
pBuilding->sDownClimbSpots[ pBuilding->ubNumClimbSpots ] = sRightGridNo; pBuilding->sDownClimbSpots[ pBuilding->ubNumClimbSpots ] = sRightGridNo;
@@ -308,6 +308,7 @@ INT32 iLoopCount = 0;
// skip the next spot // skip the next spot
bSkipSpots = 1; bSkipSpots = 1;
} }
/*
else else
{ {
// didn't pick this location, so increase chance that next location // didn't pick this location, so increase chance that next location
@@ -317,6 +318,7 @@ INT32 iLoopCount = 0;
uiChanceIn--; uiChanceIn--;
} }
} }
*/
} }
else else
Utils/_Ja25ChineseText.cpp
+3 -3
View File
@@ -109,9 +109,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25DutchText.cpp
+3 -3
View File
@@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25EnglishText.cpp
+3 -3
View File
@@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25FrenchText.cpp
+3 -3
View File
@@ -75,9 +75,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25GermanText.cpp
+2 -2
View File
@@ -75,8 +75,8 @@ STR16 gzDisplayCoverText[]=
L"Deckung: %d/100 %s, Helligkeit: %d/100", L"Deckung: %d/100 %s, Helligkeit: %d/100",
L"Waffen-Rchwt.: %d/%d Felder, Trefferwahrsch.: %d/100", L"Waffen-Rchwt.: %d/%d Felder, Trefferwahrsch.: %d/100",
L"Deckungsanzeige ausschalten", L"Deckungsanzeige ausschalten",
L"Zeige Söldneransicht", L"Zeige Ansicht für Söldner",
L"Zeige Deckung für Söldner", L"Zeige Gefahrenbereich für Söldner",
L"Wald", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wald", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Stadt", L"Stadt",
L"Wüste", L"Wüste",
Utils/_Ja25ItalianText.cpp
+3 -3
View File
@@ -75,9 +75,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25PolishText.cpp
+3 -3
View File
@@ -75,9 +75,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25RussianText.cpp
+3 -3
View File
@@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
Utils/_Ja25TaiwaneseText.cpp
+3 -3
View File
@@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]=
{ {
L"Cover: %d/100 %s, Brightness: %d/100", L"Cover: %d/100 %s, Brightness: %d/100",
L"Gun Range: %d/%d tiles, Chance to hit: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100",
L"Disabling Cover Display", L"Disabling cover display",
L"Showing Mercenary View", L"Showing mercenary view",
L"Showing Cover for Mercenary", L"Showing danger zones for mercenary",
L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald)
L"Urban", L"Urban",
L"Desert", L"Desert",
ja2_2005Express.vcproj
+6 -6
View File
@@ -17,7 +17,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="\games\jagged alliance 2" OutputDirectory="C:\Games\Jagged Alliance 2 - EN"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops"
@@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib" AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_EN_Debug_3111.exe" OutputFile="$(OutDir)\JA2_EN_3274_Debug.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@@ -99,7 +99,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="\games\jagged alliance 2" OutputDirectory="C:\Games\Jagged Alliance 2 - EN"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops"
@@ -145,7 +145,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib" AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_EN_3111.exe" OutputFile="$(OutDir)\JA2_EN_3274.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
GenerateMapFile="true" GenerateMapFile="true"
@@ -183,7 +183,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="\games\jagged alliance 2" OutputDirectory="C:\Games\Jagged Alliance 2 - EN"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops"
@@ -267,7 +267,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditorD|Win32" Name="MapEditorD|Win32"
OutputDirectory="\games\jagged alliance 2" OutputDirectory="C:\Games\Jagged Alliance 2 - EN"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops"