[Scummvm-git-logs] scummvm master -> 4c8a249949c0eb9c2285cd83030e2ba66bcd4916

[Die4Ever]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4dbfb9b9da GROOVIE: T11H Souped Up direct save and load
4c8a249949 GROOVIE: T11H Souped Up default to Easier AI


Commit: 4dbfb9b9da3cb6fd29d96f14a7cc0ec7c4385746
    https://github.com/scummvm/scummvm/commit/4dbfb9b9da3cb6fd29d96f14a7cc0ec7c4385746
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-12-20T00:46:40-06:00

Commit Message:
GROOVIE: T11H Souped Up direct save and load

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 04147ef68ae..d4b6784dd82 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -177,6 +177,8 @@ bool Script::loadScript(Common::String filename) {
 
 	// Load the code
 	_codeSize = scriptfile->size();
+	if (_codeSize <= 0)
+		return false;
 	delete[] _code;
 	_code = new byte[_codeSize];
 	if (!_code)
@@ -292,7 +294,10 @@ void Script::directGameLoad(int slot) {
 		}
 	} else if (_version == kGroovieT11H) {
 		setVariable(0xF, slot);
-		_currentInstruction = 0xE78D;
+		if (_scriptFile == "suscript.grv")
+			_currentInstruction = 0x13;
+		else
+			_currentInstruction = 0xE78D;
 		return;
 	} else if (_version == kGroovieCDY) {
 		setVariable(0x1, slot);
@@ -2225,6 +2230,33 @@ void Script::o2_videofromref() {
 
 			_currentInstruction = 0xBF37; // main menu
 		}
+		// T11H Souped Up
+		else if (_currentInstruction == 0x10 && _scriptFile == "suscript.grv") {
+			// Load from the main menu
+			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+			int slot = dialog->runModalWithCurrentTarget();
+			delete dialog;
+
+			if (slot >= 0) {
+				_currentInstruction = 0x16;
+				loadgame(slot);
+				return;
+			} else {
+				_currentInstruction = 0x8; // main menu
+			}
+		} else if (_currentInstruction == 0x1E && _scriptFile == "suscript.grv") {
+			// Save from the main menu
+			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+			int slot = dialog->runModalWithCurrentTarget();
+			Common::String saveName = dialog->getResultString();
+			delete dialog;
+
+			if (slot >= 0) {
+				directGameSave(slot, saveName);
+			}
+
+			_currentInstruction = 0x8; // main menu
+		}
 	}
 
 	// Show the debug information just when starting the playback


Commit: 4c8a249949c0eb9c2285cd83030e2ba66bcd4916
    https://github.com/scummvm/scummvm/commit/4c8a249949c0eb9c2285cd83030e2ba66bcd4916
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-12-20T00:46:56-06:00

Commit Message:
GROOVIE: T11H Souped Up default to Easier AI

Changed paths:
    engines/groovie/detection.cpp
    engines/groovie/detection.h
    engines/groovie/metaengine.cpp


diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 7c8f2fa08a6..b56c130b893 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -161,7 +161,7 @@ static const GroovieGameDescription gameDescriptions[] = {
 	// The 11th Hour: Souped Up
 	GROOVIEGAME("11hsu", "", "suscript.grv", NULL, -1,
 					"introd1.gjd", "9ec3e727182fbe40ee23e786721180eb", 6437077, EN_ANY, kPlatformWindows, BASE_FLAGS,
-					GUIO6(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_EASIER_AI, GAMEOPTION_SPEEDRUN), kGroovieT11H),
+					GUIO6(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_EASIER_AI_DEFAULT, GAMEOPTION_SPEEDRUN), kGroovieT11H),
 
 /*==== The 11th Hour Demos ====*/
 	// The 11th Hour DOS Interactive Demo English https://archive.org/details/11th_Hour_demo
diff --git a/engines/groovie/detection.h b/engines/groovie/detection.h
index dea8b219adc..bf17439d33a 100644
--- a/engines/groovie/detection.h
+++ b/engines/groovie/detection.h
@@ -45,6 +45,7 @@ struct GroovieGameDescription {
 #define GAMEOPTION_EASIER_AI GUIO_GAMEOPTIONS3
 #define GAMEOPTION_FINAL_HOUR GUIO_GAMEOPTIONS4
 #define GAMEOPTION_SPEEDRUN GUIO_GAMEOPTIONS5
+#define GAMEOPTION_EASIER_AI_DEFAULT GUIO_GAMEOPTIONS6
 
 } // End of namespace Groovie
 
diff --git a/engines/groovie/metaengine.cpp b/engines/groovie/metaengine.cpp
index 2b0f012c0dc..c9e933bc402 100644
--- a/engines/groovie/metaengine.cpp
+++ b/engines/groovie/metaengine.cpp
@@ -67,6 +67,18 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		}
 	},
 
+	{
+		GAMEOPTION_EASIER_AI_DEFAULT,
+		{
+			_s("Easier AI"),
+			_s("Decrease the difficulty of AI puzzles"),
+			"easier_ai",
+			true,
+			0,
+			0
+		}
+	},
+
 	{
 		GAMEOPTION_FINAL_HOUR,
 		{