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

- bug fix: Drassen assault not happening regardless of the setting in ini

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@342 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-07-10 21:00:57 +00:00
parent 5abf2dd62f
commit 861ee7d197
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1 -1
View File
@@ -385,7 +385,7 @@ void LoadGameExternalOptions()
gGameExternalOptions.ubGameProgressStartMadlabQuest = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_START_MADLAB_QUEST",35); gGameExternalOptions.ubGameProgressStartMadlabQuest = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_START_MADLAB_QUEST",35);
gGameExternalOptions.ubGameProgressMikeAvailable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_MIKE_AVALIABLE",50); gGameExternalOptions.ubGameProgressMikeAvailable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_MIKE_AVALIABLE",50);
gGameExternalOptions.ubGameProgressIggyAvaliable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_IGGY_AVALIABLE",70); gGameExternalOptions.ubGameProgressIggyAvaliable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_IGGY_AVALIABLE",70);
gGameExternalOptions.gfSendTroopsToDrassen = iniReader.ReadInteger("JA2 Gameplay Settings","STRATEGIC_EVENT_SEND_TROOPS_TO_DRASSEN",TRUE); gGameExternalOptions.ubSendTroopsToDrassen = iniReader.ReadBoolean("JA2 Gameplay Settings","STRATEGIC_EVENT_SEND_TROOPS_TO_DRASSEN",TRUE);
//Weapons modification //Weapons modification
GameSettings.h
+1 -1
View File
@@ -246,7 +246,7 @@ typedef struct
UINT32 ubGameProgressStartMadlabQuest; UINT32 ubGameProgressStartMadlabQuest;
UINT32 ubGameProgressMikeAvailable; UINT32 ubGameProgressMikeAvailable;
UINT32 ubGameProgressIggyAvaliable; UINT32 ubGameProgressIggyAvaliable;
BOOLEAN gfSendTroopsToDrassen; BOOLEAN ubSendTroopsToDrassen;
//Gameplay settings //Gameplay settings
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.341" }; INT16 zVersionLabel[256] = { L"Release v1.13.342" };
#endif #endif
JA2.vcproj
+2 -2
View File
@@ -43,7 +43,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.340_2006_07_10.exe" OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.342_2006_07_10.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.340_2006_07_10.exe" OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.342_2006_07_10.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Strategic/Strategic AI.cpp
+1 -1
View File
@@ -4016,7 +4016,7 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
//MoveSAIGroupToSector( &pGroup, ubSectorID, EVASIVE, pGroup->pEnemyGroup->ubIntention ); //MoveSAIGroupToSector( &pGroup, ubSectorID, EVASIVE, pGroup->pEnemyGroup->ubIntention );
if ( !gGameExternalOptions.gfSendTroopsToDrassen ) if ( !gGameExternalOptions.ubSendTroopsToDrassen )
break; break;
ubSourceSectorID = SEC_H13; ubSourceSectorID = SEC_H13;