[Scummvm-git-logs] scummvm master -> 9d8edfa3307c45a6655d547381102f13701950d5
dreammaster
paulfgilbert at gmail.com
Tue Jun 23 03:14:05 UTC 2020
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:
f0e1e1e56d GLK: ZCODE: Change interpreter to INTERPRETER_ZCODE
9d8edfa330 GLK: ZCODE: Fix Scott Adams detection entries
Commit: f0e1e1e56dfede4ea2b59ee7e8ec98bc9ab64287
https://github.com/scummvm/scummvm/commit/f0e1e1e56dfede4ea2b59ee7e8ec98bc9ab64287
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-22T20:11:00-07:00
Commit Message:
GLK: ZCODE: Change interpreter to INTERPRETER_ZCODE
Changed paths:
engines/glk/blorb.cpp
engines/glk/conf.cpp
engines/glk/glk_types.h
engines/glk/quetzal.cpp
engines/glk/zcode/detection.cpp
engines/glk/zcode/zcode.h
diff --git a/engines/glk/blorb.cpp b/engines/glk/blorb.cpp
index 4678c1d75c..b4beef9ce9 100644
--- a/engines/glk/blorb.cpp
+++ b/engines/glk/blorb.cpp
@@ -144,12 +144,12 @@ Common::ErrorCode Blorb::load() {
} else if (ce._type == ID_Exec) {
if (
(_interpType == INTERPRETER_ADRIFT && ce._id == ID_ADRI) ||
- (_interpType == INTERPRETER_FROTZ && ce._id == ID_ZCOD) ||
(_interpType == INTERPRETER_GLULXE && 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) ||
(_interpType == INTERPRETER_TADS3 && ce._id == ID_TAD3) ||
- (_interpType == INTERPRETER_HUGO && ce._id == ID_HUGO) ||
- (_interpType == INTERPRETER_SCOTT && ce._id == ID_SAAI)
+ (_interpType == INTERPRETER_ZCODE && ce._id == ID_ZCOD)
) {
// Game executable
ce._filename = "game";
@@ -283,7 +283,7 @@ void Blorb::getBlorbFilenames(const Common::String &srcFilename, Common::StringA
case INTERPRETER_ALAN3:
filenames.push_back(filename + "a3r");
break;
- case INTERPRETER_FROTZ:
+ case INTERPRETER_ZCODE:
filenames.push_back(filename + "zblorb");
getInfocomBlorbFilenames(filenames, gameId);
break;
diff --git a/engines/glk/conf.cpp b/engines/glk/conf.cpp
index 5c6bc761bc..8c33a8a7db 100644
--- a/engines/glk/conf.cpp
+++ b/engines/glk/conf.cpp
@@ -94,8 +94,8 @@ Conf::Conf(InterpreterType interpType) {
if (ConfMan.hasKey("maxcols"))
_cols = MIN(_cols, strToInt(ConfMan.get("maxcols").c_str()));
- const int DEFAULT_MARGIN_X = (interpType == INTERPRETER_FROTZ) ? 0 : 15;
- const int DEFAULT_MARGIN_Y = (interpType == INTERPRETER_FROTZ) ? 0 : 15;
+ const int DEFAULT_MARGIN_X = (interpType == INTERPRETER_ZCODE) ? 0 : 15;
+ const int DEFAULT_MARGIN_Y = (interpType == INTERPRETER_ZCODE) ? 0 : 15;
get("lockrows", _lockRows);
get("lockcols", _lockCols);
diff --git a/engines/glk/glk_types.h b/engines/glk/glk_types.h
index 0824661c13..eba0567e45 100644
--- a/engines/glk/glk_types.h
+++ b/engines/glk/glk_types.h
@@ -44,7 +44,6 @@ enum InterpreterType {
INTERPRETER_ARCHETYPE,
INTERPRETER_BOCFEL,
INTERPRETER_COMPREHEND,
- INTERPRETER_FROTZ,
INTERPRETER_GEAS,
INTERPRETER_GLULXE,
INTERPRETER_HUGO,
@@ -55,7 +54,8 @@ enum InterpreterType {
INTERPRETER_SCARE,
INTERPRETER_SCOTT,
INTERPRETER_TADS2,
- INTERPRETER_TADS3
+ INTERPRETER_TADS3,
+ INTERPRETER_ZCODE
};
/**
diff --git a/engines/glk/quetzal.cpp b/engines/glk/quetzal.cpp
index f1cece12c3..a0cf86c029 100644
--- a/engines/glk/quetzal.cpp
+++ b/engines/glk/quetzal.cpp
@@ -50,8 +50,6 @@ uint32 QuetzalBase::getInterpreterTag(InterpreterType interpType) {
return MKTAG('A', 'R', 'C', 'H');
case INTERPRETER_COMPREHEND:
return MKTAG('C', 'O', 'M', 'P');
- case INTERPRETER_FROTZ:
- return MKTAG('Z', 'C', 'O', 'D');
case INTERPRETER_GEAS:
return MKTAG('G', 'E', 'A', 'S');
case INTERPRETER_GLULXE:
@@ -74,6 +72,8 @@ uint32 QuetzalBase::getInterpreterTag(InterpreterType interpType) {
return MKTAG('T', 'A', 'D', '2');
case INTERPRETER_TADS3:
return MKTAG('T', 'A', 'D', '3');
+ case INTERPRETER_ZCODE:
+ return MKTAG('Z', 'C', 'O', 'D');
default:
error("Invalid interpreter type");
}
diff --git a/engines/glk/zcode/detection.cpp b/engines/glk/zcode/detection.cpp
index bc24c9648e..178b480214 100644
--- a/engines/glk/zcode/detection.cpp
+++ b/engines/glk/zcode/detection.cpp
@@ -99,7 +99,7 @@ bool ZCodeMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
gameFile.read(&serial[1], 6);
strcpy(&serial[7], "\"");
} else {
- Blorb b(*file, INTERPRETER_FROTZ);
+ Blorb b(*file, INTERPRETER_ZCODE);
Common::SeekableReadStream *f = b.createReadStreamForMember("game");
emptyBlorb = f == nullptr;
diff --git a/engines/glk/zcode/zcode.h b/engines/glk/zcode/zcode.h
index 7fbc795ad2..b3f48e7ac5 100644
--- a/engines/glk/zcode/zcode.h
+++ b/engines/glk/zcode/zcode.h
@@ -64,7 +64,7 @@ public:
/**
* Returns the running interpreter type
*/
- InterpreterType getInterpreterType() const override { return INTERPRETER_FROTZ; }
+ InterpreterType getInterpreterType() const override { return INTERPRETER_ZCODE; }
/**
* Execute the game
Commit: 9d8edfa3307c45a6655d547381102f13701950d5
https://github.com/scummvm/scummvm/commit/9d8edfa3307c45a6655d547381102f13701950d5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-22T20:13:45-07:00
Commit Message:
GLK: ZCODE: Fix Scott Adams detection entries
Changed paths:
engines/glk/zcode/detection_tables.h
diff --git a/engines/glk/zcode/detection_tables.h b/engines/glk/zcode/detection_tables.h
index d9101e817f..bb3a373319 100644
--- a/engines/glk/zcode/detection_tables.h
+++ b/engines/glk/zcode/detection_tables.h
@@ -1149,7 +1149,6 @@ const FrotzGameDescription FROTZ_GAMES[] = {
ENTRY0("adv350", "011123", "5d4867b23e904d22453f031c87d6dcf0", 118272),
ENTRY0("adv350", "160307", "5f800280865d57cbfeb66695e79dc9b9", 147456),
ENTRY0("adv", "150118", "c776a1a9a8122967160fb51a39485113", 431616),
- ENTRY0("adventureland", "961111", "21f1bd1815a8b3ba5730fe168ff88e59", 49152),
ENTRY0("adventuretime", "110111", "b6e0e55780b699e37411f0eb176f7496", 359368),
ENTRY0("adverbum", "060905", "e5c04bcadb953ad0a280b541f7510338", 138240),
ENTRY0("affront", "040226", "1b10a2dcedebdea772cea1c7b0407331", 50176),
@@ -1840,24 +1839,25 @@ const FrotzGameDescription FROTZ_GAMES[] = {
ENTRY0("plsg10", "111118", "30705c933686364f9086a36aac9579df", 260096),
// Converted Scott Adams games
- ENTRY0("adventureland", "941017", "cde66d37efaff46f18e67b0f39e4d0cd", 43008),
- ENTRY0("scottsampler", "980329", "86c473c81e86637105108afa943c3ced", 23040),
- ENTRY0("buckaroobanzai", "980329", "cdbf748cdcee3cade378cf62cfe01d43", 24064),
- ENTRY0("thecount", "980329", "a0060ef9c9fa5cc3d3dbbc060f6451c2", 25088),
- ENTRY0("mysteryfunhouse", "980329", "4b78c1883356db8184b351c5a269fdce", 24064),
- ENTRY0("ghosttown", "980329", "0240f4119bb9b8e8197f37049c9b4f82", 25600),
- ENTRY0("goldenvoyage", "980329", "d986f2ac673abdce741c90e8b9fc3acf", 26112),
- ENTRY0("marveladventure", "HULK-980329", "964dfa22fcd54d2674123951af79136b", 25600),
- ENTRY0("strangeodyssey", "980329", "8216fc5ca7ed593d6a9c4265064d83a4", 24576),
- ENTRY0("pirateadventure", "980329", "0c3d27eaa6563835bfb1aadd309e7a00", 24064),
- ENTRY0("pyramidofdoom", "980329", "a6fc7fd81b7330bc254afbac17b29058", 26112),
- ENTRY0("adventure14", "980329", "56e5d7c33d5403ed59a62f67744f4d02", 26624),
- ENTRY0("savageisland1", "980329", "6f6cf307a97becb32524fe66a910587e", 24576),
- ENTRY0("savageisland2", "980329", "a43ab1063e6a8d4849ad3b69f1e4cacb", 25600),
- ENTRY0("missionimpossible", "980329", "9c759b65e43e2d9d6aa02122248040ae", 24064),
- ENTRY0("adventure13", "980329", "54cc89bbead7dac21455b9c00f32f604", 25088),
- ENTRY0("questprobe2", "980329", "6b9cb86c332c092b3a93973ba9f4c946", 27136),
- ENTRY0("voodoocastle", "980329", "bff285e6c9291fc6ba77c9743b610c2d", 24064),
+ ENTRY0("adventurelandi5", "941017", "cde66d37efaff46f18e67b0f39e4d0cd", 43008),
+ ENTRY0("adventurelandi5", "961111", "21f1bd1815a8b3ba5730fe168ff88e59", 49152),
+ ENTRY0("scottsampleri5", "980329", "86c473c81e86637105108afa943c3ced", 23040),
+ ENTRY0("buckaroobanzaii5", "980329", "cdbf748cdcee3cade378cf62cfe01d43", 24064),
+ ENTRY0("thecounti5", "980329", "a0060ef9c9fa5cc3d3dbbc060f6451c2", 25088),
+ ENTRY0("mysteryfunhousei5", "980329", "4b78c1883356db8184b351c5a269fdce", 24064),
+ ENTRY0("ghosttowni5", "980329", "0240f4119bb9b8e8197f37049c9b4f82", 25600),
+ ENTRY0("goldenvoyagei5", "980329", "d986f2ac673abdce741c90e8b9fc3acf", 26112),
+ ENTRY0("marveladventurei5", "HULK-980329", "964dfa22fcd54d2674123951af79136b", 25600),
+ ENTRY0("strangeodysseyi5", "980329", "8216fc5ca7ed593d6a9c4265064d83a4", 24576),
+ ENTRY0("pirateadventurei5", "980329", "0c3d27eaa6563835bfb1aadd309e7a00", 24064),
+ ENTRY0("pyramidofdoomi5", "980329", "a6fc7fd81b7330bc254afbac17b29058", 26112),
+ ENTRY0("adventure14i5", "980329", "56e5d7c33d5403ed59a62f67744f4d02", 26624),
+ ENTRY0("savageisland1i5", "980329", "6f6cf307a97becb32524fe66a910587e", 24576),
+ ENTRY0("savageisland2i5", "980329", "a43ab1063e6a8d4849ad3b69f1e4cacb", 25600),
+ ENTRY0("missionimpossiblei5", "980329", "9c759b65e43e2d9d6aa02122248040ae", 24064),
+ ENTRY0("adventure13i5", "980329", "54cc89bbead7dac21455b9c00f32f604", 25088),
+ ENTRY0("questprobe2i5", "980329", "6b9cb86c332c092b3a93973ba9f4c946", 27136),
+ ENTRY0("voodoocastlei5", "980329", "bff285e6c9291fc6ba77c9743b610c2d", 24064),
// Mysterious Adventures by Brian Howarth
ENTRY0("goldenbatoni5", "980406", "408b31a15c429f7ca83b2ac80764ffa8", 20992),
More information about the Scummvm-git-logs
mailing list