[Scummvm-git-logs] scummvm master -> 806059b30c99e682dc462867042de84995c81635

[dreammaster]

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:
33e1fe64a7 GLK: GLULX: Rename interpreter enum value
806059b30c GLK: LEVEL9: Remove Champion of the Raj detection entries


Commit: 33e1fe64a76e425d8bf8f6735c30369c8f8f4ac3
    https://github.com/scummvm/scummvm/commit/33e1fe64a76e425d8bf8f6735c30369c8f8f4ac3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-08-26T22:03:04-07:00

Commit Message:
GLK: GLULX: Rename interpreter enum value

Changed paths:
    engines/glk/blorb.cpp
    engines/glk/glk_types.h
    engines/glk/glulx/glulx.h
    engines/glk/quetzal.cpp


diff --git a/engines/glk/blorb.cpp b/engines/glk/blorb.cpp
index 9e3a70c782..386f06c7e2 100644
--- a/engines/glk/blorb.cpp
+++ b/engines/glk/blorb.cpp
@@ -144,7 +144,7 @@ Common::ErrorCode Blorb::load() {
 		} else if (ce._type == ID_Exec) {
 			if (
 				(_interpType == INTERPRETER_ADRIFT && ce._id == ID_ADRI) ||
-				(_interpType == INTERPRETER_GLULXE && ce._id == ID_GLUL) ||
+				(_interpType == INTERPRETER_GLULX && ce._id == ID_GLUL) ||
 				(_interpType == INTERPRETER_HUGO && ce._id == ID_HUGO) ||
 				(_interpType == INTERPRETER_SCOTT && ce._id == ID_SAAI) ||
 				(_interpType == INTERPRETER_TADS2 && ce._id == ID_TAD2) ||
@@ -283,13 +283,13 @@ void Blorb::getBlorbFilenames(const Common::String &srcFilename, Common::StringA
 	case INTERPRETER_ALAN3:
 		filenames.push_back(filename + "a3r");
 		break;
+	case INTERPRETER_GLULX:
+		filenames.push_back(filename + "gblorb");
+		break;
 	case INTERPRETER_ZCODE:
 		filenames.push_back(filename + "zblorb");
 		getInfocomBlorbFilenames(filenames, gameId);
 		break;
-	case INTERPRETER_GLULXE:
-		filenames.push_back(filename + "gblorb");
-		break;
 	default:
 		break;
 	}
diff --git a/engines/glk/glk_types.h b/engines/glk/glk_types.h
index eba0567e45..34062d12af 100644
--- a/engines/glk/glk_types.h
+++ b/engines/glk/glk_types.h
@@ -45,7 +45,7 @@ enum InterpreterType {
 	INTERPRETER_BOCFEL,
 	INTERPRETER_COMPREHEND,
 	INTERPRETER_GEAS,
-	INTERPRETER_GLULXE,
+	INTERPRETER_GLULX,
 	INTERPRETER_HUGO,
 	INTERPRETER_JACL,
 	INTERPRETER_LEVEL9,
diff --git a/engines/glk/glulx/glulx.h b/engines/glk/glulx/glulx.h
index 8406cace77..19de42ed29 100644
--- a/engines/glk/glulx/glulx.h
+++ b/engines/glk/glulx/glulx.h
@@ -407,7 +407,7 @@ public:
 	 * Returns the running interpreter type
 	 */
 	InterpreterType getInterpreterType() const override {
-		return INTERPRETER_GLULXE;
+		return INTERPRETER_GLULX;
 	}
 
 	/**
diff --git a/engines/glk/quetzal.cpp b/engines/glk/quetzal.cpp
index a0cf86c029..67a576f745 100644
--- a/engines/glk/quetzal.cpp
+++ b/engines/glk/quetzal.cpp
@@ -52,7 +52,7 @@ uint32 QuetzalBase::getInterpreterTag(InterpreterType interpType) {
 		return MKTAG('C', 'O', 'M', 'P');
 	case INTERPRETER_GEAS:
 		return MKTAG('G', 'E', 'A', 'S');
-	case INTERPRETER_GLULXE:
+	case INTERPRETER_GLULX:
 		return MKTAG('G', 'L', 'U', 'L');
 	case INTERPRETER_HUGO:
 		return MKTAG('H', 'U', 'G', 'O');


Commit: 806059b30c99e682dc462867042de84995c81635
    https://github.com/scummvm/scummvm/commit/806059b30c99e682dc462867042de84995c81635
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-08-26T22:07:46-07:00

Commit Message:
GLK: LEVEL9: Remove Champion of the Raj detection entries

Changed paths:
    engines/glk/level9/detection_tables.h


diff --git a/engines/glk/level9/detection_tables.h b/engines/glk/level9/detection_tables.h
index d4e3da34b5..858c8322a1 100644
--- a/engines/glk/level9/detection_tables.h
+++ b/engines/glk/level9/detection_tables.h
@@ -104,25 +104,6 @@ static const gln_game_table_t GLN_GAME_TABLE[] = {
 	{0x5b58, 0x50, 0x332e, "adventurequest", "Adventure Quest /JoD", "Atari"},
 	{0x5ace, 0x11, 0xdc12, "adventurequest", "Adventure Quest /JoD", "Spectrum 48"},
 
-	{0x3ebb, 0x00, 0xf6dc, "championraj", "Champion of the Raj", "English 1/2 GD/Amiga"},
-	{0x0fd8, 0x00, 0xf250, "championraj", "Champion of the Raj", "English 2/2 GD/Amiga"},
-
-	{0x3e8f, 0x00, 0x5599, "championraj", "Champion of the Raj", "English 1/2 GD/ST"},
-
-	{0x3e4f, 0x00, 0xb202, "championraj", "Champion of the Raj", "English 1/2 GD/PC"},
-	{0x14a3, 0x00, 0xa288, "championraj", "Champion of the Raj", "English 2/2 GD/PC"},
-
-	{0x1929, 0x00, 0xd4b2, "championraj", "Champion of the Raj", "demo, 1/2 GD/ST"},
-	{0x40e0, 0x02, 0x080d, "championraj", "Champion of the Raj", "demo, 2/2 GD/ST"},
-
-	{0x4872, 0x00, 0x9515, "championraj", "Champion of the Raj", "German 1/2 GD/Amiga"},
-	{0x11f5, 0x00, 0xbf39, "championraj", "Champion of the Raj", "German 2/2 GD/Amiga"},
-
-	{0x4846, 0x00, 0xd9c1, "championraj", "Champion of the Raj", "German 1/2 GD/ST"},
-	{0x11f5, 0x00, 0x7aa4, "championraj", "Champion of the Raj", "German 2/2 GD/ST"},
-
-	{0x110f, 0x00, 0x4b57, "championraj", "Champion of the Raj", "French 2/2 GD/ST"},
-
 	{0x76f4, 0x5e, 0x1fe5, "colossaladvjod", "Colossal Adventure /JoD", "Amiga/PC"},
 	{0x76f4, 0x5a, 0xcf4b, "colossaladvjod", "Colossal Adventure /JoD", "ST"},
 	{0x6f70, 0x40, 0xbd91, "colossaladvjod", "Colossal Adventure /JoD", "MSX"},