[Scummvm-git-logs] scummvm master -> 671298f2d1a2eadd21c4ea4a78c6dca3c6fc9beb

[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:
671298f2d1 AGI: Remove superfluous AGI version setup for AGDS games


Commit: 671298f2d1a2eadd21c4ea4a78c6dca3c6fc9beb
    https://github.com/scummvm/scummvm/commit/671298f2d1a2eadd21c4ea4a78c6dca3c6fc9beb
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-01-27T04:28:47+02:00

Commit Message:
AGI: Remove superfluous AGI version setup for AGDS games

Changed paths:
    engines/agi/agi.h
    engines/agi/loader_v2.cpp
    engines/agi/metaengine.cpp


diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 580a97ab53c..1cff3cfd815 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -117,7 +117,7 @@ enum AgiGameType {
 
 enum AgiGameFeatures {
 	GF_AGIMOUSE    = (1 << 0), // this disables "Click-to-walk mouse interface"
-	GF_AGDS        = (1 << 1),
+	GF_AGDS        = (1 << 1), // marks games created with AGDS - all using AGI version 2.440
 	GF_AGI256      = (1 << 2), // marks fanmade AGI-256 games
 	GF_FANMADE     = (1 << 3), // marks fanmade games
 	GF_2GSOLDSOUND = (1 << 5),
@@ -761,7 +761,6 @@ public:
 	void initFeatures();
 	void setFeature(uint32 feature);
 	void initVersion();
-	void setVersion(uint16 version);
 
 	const char *getDiskName(uint16 id);
 
diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp
index 7b3e40d204f..def8d9f4842 100644
--- a/engines/agi/loader_v2.cpp
+++ b/engines/agi/loader_v2.cpp
@@ -33,11 +33,6 @@ int AgiLoader_v2::detectGame() {
 	    !Common::File::exists(VIEWDIR))
 		return errInvalidAGIFile;
 
-	// Should this go above the previous lines, so we can force emulation versions
-	// even for AGDS games? -- dsymonds
-	if (_vm->getFeatures() & GF_AGDS)
-		_vm->setVersion(0x2440);   // ALL AGDS games built for 2.440
-
 	return errOK;
 }
 
diff --git a/engines/agi/metaengine.cpp b/engines/agi/metaengine.cpp
index 4459bd99fb7..10fd89b9d21 100644
--- a/engines/agi/metaengine.cpp
+++ b/engines/agi/metaengine.cpp
@@ -87,10 +87,6 @@ void AgiBase::setFeature(uint32 feature) {
 	_gameFeatures |= feature;
 }
 
-void AgiBase::setVersion(uint16 version) {
-	_gameVersion = version;
-}
-
 void AgiBase::initVersion() {
 	_gameVersion = _gameDescription->version;
 }