[Scummvm-git-logs] scummvm master -> 8dcd4e27f426ada6e42ff290abf4cf85679f9655

[bluegr]

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

Summary:
8dcd4e27f4 AGI: Get rid of the older game flags


Commit: 8dcd4e27f426ada6e42ff290abf4cf85679f9655
    https://github.com/scummvm/scummvm/commit/8dcd4e27f426ada6e42ff290abf4cf85679f9655
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-01-27T03:27:27+02:00

Commit Message:
AGI: Get rid of the older game flags

These are leftovers from Sarien, and are no longer needed

Changed paths:
    engines/agi/agi.cpp
    engines/agi/agi.h
    engines/agi/objects.cpp
    engines/agi/preagi/preagi.cpp
    engines/agi/saveload.cpp


diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 23e4cc22df1..a62ae803f45 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -143,15 +143,9 @@ int AgiEngine::agiInit() {
 	}
 
 	if (getPlatform() == Common::kPlatformAmiga)
-		_game.gameFlags |= ID_AMIGA;
-
-	if (getFeatures() & GF_AGDS)
-		_game.gameFlags |= ID_AGDS;
-
-	if (_game.gameFlags & ID_AMIGA)
 		debug(1, "Amiga padded game detected.");
 
-	if (_game.gameFlags & ID_AGDS)
+	if (getFeatures() & GF_AGDS)
 		debug(1, "AGDS mode enabled.");
 
 	ec = _loader->init();   // load vol files, etc
@@ -450,8 +444,6 @@ void AgiEngine::initialize() {
 
 	_text->init(_systemUI);
 
-	_game.gameFlags = 0;
-
 	_text->charAttrib_Set(15, 0);
 
 	_game.name[0] = '\0';
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index bf04298909f..580a97ab53c 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -413,9 +413,6 @@ struct AgiGame {
 	bool playerControl; /**< player is in control */
 	bool exitAllLogics; /**< break cycle after new.room */
 	bool pictureShown;  /**< show.pic has been issued */
-#define ID_AGDS     0x00000001
-#define ID_AMIGA    0x00000002
-	int gameFlags;      /**< agi options flags */
 
 	// windows
 	AgiBlock block;
@@ -512,7 +509,6 @@ struct AgiGame {
 		playerControl = false;
 		exitAllLogics = false;
 		pictureShown = false;
-		gameFlags = 0;
 
 		// block defaulted by AgiBlock constructor
 
diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp
index d5964bbc4c5..b014eaee1bb 100644
--- a/engines/agi/objects.cpp
+++ b/engines/agi/objects.cpp
@@ -28,7 +28,7 @@ namespace Agi {
 int AgiEngine::decodeObjects(uint8 *mem, uint32 flen) {
 	unsigned int i, so, padsize, spos;
 
-	padsize = _game.gameFlags & ID_AMIGA ? 4 : 3;
+	padsize = getPlatform() == Common::kPlatformAmiga ? 4 : 3;
 
 	_game.numObjects = 0;
 
diff --git a/engines/agi/preagi/preagi.cpp b/engines/agi/preagi/preagi.cpp
index 134435a9afa..dcad8a2d2a9 100644
--- a/engines/agi/preagi/preagi.cpp
+++ b/engines/agi/preagi/preagi.cpp
@@ -50,8 +50,6 @@ void PreAgiEngine::initialize() {
 
 	_font->init();
 
-	_game.gameFlags = 0;
-
 	//_game._vm->_text->charAttrib_Set(15, 0);
 
 	_defaultColor = 0xF;
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index bf62f856209..b1e566b0af9 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -175,7 +175,7 @@ int AgiEngine::saveGame(const Common::String &fileName, const Common::String &de
 	out->writeSint16BE((int16)_game.exitAllLogics);
 	out->writeSint16BE((int16)_game.pictureShown);
 	out->writeSint16BE((int16)_text->promptIsEnabled()); // was "_game.hasPrompt", no longer needed
-	out->writeSint16BE((int16)_game.gameFlags);
+	out->writeSint16BE(0);	// was _game.gameFlags, no longer needed
 
 	if (_text->promptIsEnabled()) {
 		out->writeSint16BE(0x7FFF);
@@ -504,7 +504,7 @@ int AgiEngine::loadGame(const Common::String &fileName, bool checkId) {
 	_game.exitAllLogics = in->readSint16BE();
 	in->readSint16BE(); // was _game.pictureShown
 	in->readSint16BE(); // was _game.hasPrompt, no longer needed
-	_game.gameFlags = in->readSint16BE();
+	in->readSint16BE();	// was _game.gameFlags, no longer needed
 	if (in->readSint16BE()) {
 		_text->promptEnable();
 	} else {