From 4cf6aa49d2deceecf585473578fa7015d31d6008 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 5 Dec 2013 08:24:46 +0000 Subject: [PATCH] New MOD-Setting (by Jazz) - CREATURE_MEANWHILE_CUTSCENE: Play the meanwhile cutscene ordering the release of creatures? git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6683 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 3 +++ GameSettings.h | 2 ++ Strategic/Creature Spreading.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 59eb4ca4..4c974d61 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -2597,6 +2597,9 @@ void LoadModSettings(){ gModSettings.ubMeanwhileAddMadlabSector4X = iniReader.ReadInteger("Meanwhile", "ADD_MADLAB_SECTOR_4_X", 4); gModSettings.ubMeanwhileAddMadlabSector4Y = iniReader.ReadInteger("Meanwhile", "ADD_MADLAB_SECTOR_4_Y", 5); + + gModSettings.CreatureMeanwhileCutscene = iniReader.ReadBoolean("Meanwhile", "CREATURE_MEANWHILE_CUTSCENE", TRUE); + gModSettings.ubEndGameVictorySectorX = iniReader.ReadInteger("End Game", "VICTORY_SECTOR_X", 3); gModSettings.ubEndGameVictorySectorY = iniReader.ReadInteger("End Game", "VICTORY_SECTOR_Y", 16); gModSettings.iEndGameVictoryGridNo = iniReader.ReadInteger("End Game", "VICTORY_POSITION", 5687); diff --git a/GameSettings.h b/GameSettings.h index b109b680..b6d61c95 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -1968,6 +1968,8 @@ typedef struct UINT8 ubEndGameVictorySectorY; INT32 iEndGameVictoryGridNo; + BOOLEAN CreatureMeanwhileCutscene; + }MOD_SETTINGS; // silversurfer: item property modifiers diff --git a/Strategic/Creature Spreading.cpp b/Strategic/Creature Spreading.cpp index c2cf0ac6..acd7c208 100644 --- a/Strategic/Creature Spreading.cpp +++ b/Strategic/Creature Spreading.cpp @@ -301,7 +301,7 @@ void InitCreatureQuest() #if (defined JA2UB) //Ja25 No meanwhiles && no creatures #else - if( fPlayMeanwhile && !gfCreatureMeanwhileScenePlayed ) + if( fPlayMeanwhile && !gfCreatureMeanwhileScenePlayed && gModSettings.CreatureMeanwhileCutscene == TRUE ) { //Start the meanwhile scene for the queen ordering the release of the creatures. HandleCreatureRelease();