[Scummvm-git-logs] scummvm master -> 0c940567dda10e432760aec22921d1554c296973
dreammaster
paulfgilbert at gmail.com
Fri Apr 3 02:53:56 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:
ac38d08700 GLK: FROTZ: Added extra Infocom version detections
0c940567dd GLK: FROTZ: Fix crash opening up Milliways release 185
Commit: ac38d0870094935ddf4143fd956aeea9ad9744d6
https://github.com/scummvm/scummvm/commit/ac38d0870094935ddf4143fd956aeea9ad9744d6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-02T19:45:49-07:00
Commit Message:
GLK: FROTZ: Added extra Infocom version detections
Changed paths:
engines/glk/frotz/detection_tables.h
diff --git a/engines/glk/frotz/detection_tables.h b/engines/glk/frotz/detection_tables.h
index 808840269a..5a36f6133c 100644
--- a/engines/glk/frotz/detection_tables.h
+++ b/engines/glk/frotz/detection_tables.h
@@ -60,6 +60,7 @@ const PlainGameDescriptor INFOCOM_GAME_LIST[] = {
{ "infocomsampler1", "Infocom Sampler 1" },
{ "infocomsampler2", "Infocom Sampler 2" },
{ "lurkinghorror", "The Lurking Horror" },
+ { "milliways", "Milliways" },
{ "minizork1", "Mini Zork I: The Great Underground Empire" },
{ "moonmist", "Moonmist" },
{ "nordbert", "Nord and Bert Couldn't Make Head or Tail of It" },
@@ -1036,6 +1037,8 @@ const FrotzGameDescription FROTZ_GAMES[] = {
ENTRYS("lurkinghorror", "R203", "e2d2505510479fec0405727e3d0abc10", 128986),
ENTRYS("lurkinghorror", "R219", "83936d75c2cfd71fb64bf63c4696b9ac", 129704),
ENTRYS("lurkinghorror", "R221", "c60cd0bf3c6eda867241378c7cb5464a", 129944),
+ ENTRYS("milliways", "R15-880512", "12f5fe83d6fe2c1a6f50b2039bc5b28c", 62928),
+ ENTRYS("milliways", "R184-890412", "7726dafb083dd86ee6fa7dfeec6e1ba6", 79152),
ENTRY0("minizork1", "R34-871124", "0d7700679e5e63dec97f712698610a46", 52216),
ENTRY0("moonmist", "R4-860918", "284797c3025ffaf76aecfa5c2bbffa86", 129002),
ENTRY0("moonmist", "R9-861022", "698475de2769c66bc5a1eca600c71561", 128866),
@@ -1047,6 +1050,7 @@ const FrotzGameDescription FROTZ_GAMES[] = {
ENTRY0("planetfall", "R10-880531", "34c69f1d24418fd4d2de195a1d7546c4", 136560),
ENTRY0("questforexcalibur", "R54-890606", "ced2c66d03a49de0e8190b468332f081", 271360),
ENTRY0("questforexcalibur", "R74-890714", "13d13f375f85a874c82a8ac7ad69dc41", 269200),
+ ENTRY0("plunderedhearts", "R26-??????", "f557b52840f1ec3ad68ef941dc7dbcff", 128962),
ENTRY0("plunderedhearts", "R26-870730", "fe5b9eb91949d41838166364f1753b10", 128962),
ENTRY0("infocomsampler1", "R26-840731", "5483febc51abd55fb5e04c4c97a0b260", 112610),
ENTRY0("infocomsampler1", "R53-850407", "47b8b8394e25faec870a798145529688", 126708),
@@ -1067,13 +1071,16 @@ const FrotzGameDescription FROTZ_GAMES[] = {
ENTRY0("spellbreaker", "R63-850916", "b7b9eef231dee03fb40a9d98416fa0d5", 128480),
ENTRY0("spellbreaker", "R87-860904", "852286847f4cdd790075fa824260ff4e", 128916),
ENTRY0("starcross", "R15-820901", "fb2e6d9a0ad5822f3a8d4aec949e4e3c", 84984),
+ ENTRY0("starcross", "R17", "57b93a825b3011c8b4fbef5337c06fbc", 83792),
ENTRY0("starcross", "R17-821021", "ed1e62e1f0eb9d819be45c076c5729f7", 83792),
ENTRY0("stationfall", "R107-870430", "cfadfb66afabaa2971ec9b4ae65266ca", 128934),
+ ENTRY0("suspect", "R14-000000", "94df6e910558b3c514e42f9a8d4075dd", 118692),
ENTRY0("suspect", "R14-841005", "3d759ccb19233f51968fa79d7374b393", 118692),
- ENTRY0("suspended", "v5-830222", "d898430e3cccdee9f9acfffcc9ef709c", 105418),
+ ENTRY0("suspended", "R5", "64855adb37a3af5ce4d1fe80dfb73281", 105418),
+ ENTRY0("suspended", "R5-830222", "d898430e3cccdee9f9acfffcc9ef709c", 105418),
ENTRY0("suspended", "R7-830419", "65f0cc760a2500d110242fbf942f1028", 105500),
ENTRY0("suspended", "R8-830521", "b749d42462dfec21831b69635cd9c5e8", 105492),
- ENTRY0("suspended", "R8_2-840521", "6088ad7cb553626b52875a9b8e801312", 105584),
+ ENTRY0("suspended", "R8-840521", "6088ad7cb553626b52875a9b8e801312", 105584),
ENTRY0("trinity", "R11-860509", "994ea591f8d401e11661c912b92ee05e", 262016),
ENTRY0("trinity", "R12-860926", "5377dc1ee39f1c8ed572944f89946eb2", 262064),
ENTRY0("wishbringer", "R23-880706", "bec823084c5622e88eca5a886278d2a5", 164712),
@@ -1087,6 +1094,7 @@ const FrotzGameDescription FROTZ_GAMES[] = {
ENTRY0("zork0", "R366-890323", "e787b2cad2d6f29fd812e737f75646e8", 296376),
ENTRY0("zork0", "R383-890602", "32e3e7ec438dabe77df2351af6ece324", 299392),
ENTRY0("zork0", "R393-890714", "29fb0e090bbff7bc8e9661e55da69ae7", 299968),
+ ENTRY0("zork1", "R15", "b1fa36d05b2a7379d83d843118bd087c", 131072),
ENTRY0("zork1", "R15-UG3AU5", "fa2d22304700898cb8de921f46ca4bc9", 78566),
ENTRY0("zork1", "R20", "b222bed4a0ab2650135cba7f4b1b1c67", 75734),
ENTRY0("zork1", "R23-820428", "6ad3d9ab2874beefcbc53630e9261118", 75780),
Commit: 0c940567dda10e432760aec22921d1554c296973
https://github.com/scummvm/scummvm/commit/0c940567dda10e432760aec22921d1554c296973
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-02T19:52:32-07:00
Commit Message:
GLK: FROTZ: Fix crash opening up Milliways release 185
It's a v6 game, and it still won't properly run, but at least
it now gives a proper in-game message saying the screen width
is too small rather than just crashing trying to find an MG1 file
Changed paths:
engines/glk/frotz/config.cpp
engines/glk/frotz/config.h
engines/glk/frotz/frotz_types.h
engines/glk/frotz/glk_interface.cpp
diff --git a/engines/glk/frotz/config.cpp b/engines/glk/frotz/config.cpp
index 24f6b1d9e2..8c7ca5ad72 100644
--- a/engines/glk/frotz/config.cpp
+++ b/engines/glk/frotz/config.cpp
@@ -29,7 +29,7 @@
namespace Glk {
namespace Frotz {
-const Header::StoryEntry Header::RECORDS[25] = {
+const Header::StoryEntry Header::RECORDS[26] = {
{ SHERLOCK, 21, "871214" },
{ SHERLOCK, 26, "880127" },
{ BEYOND_ZORK, 47, "870915" },
@@ -54,6 +54,7 @@ const Header::StoryEntry Header::RECORDS[25] = {
{ LURKING_HORROR, 203, "870506" },
{ LURKING_HORROR, 219, "870912" },
{ LURKING_HORROR, 221, "870918" },
+ { MILLIWAYS, 184, "890412" },
{ UNKNOWN, 0, "------" }
};
diff --git a/engines/glk/frotz/config.h b/engines/glk/frotz/config.h
index 212d11fb22..9f3dae5270 100644
--- a/engines/glk/frotz/config.h
+++ b/engines/glk/frotz/config.h
@@ -178,7 +178,7 @@ private:
zword _release;
char _serial[7];
};
- static const StoryEntry RECORDS[25];
+ static const StoryEntry RECORDS[26];
public:
zbyte h_version;
zbyte h_config;
diff --git a/engines/glk/frotz/frotz_types.h b/engines/glk/frotz/frotz_types.h
index e758f7e49e..017cdee23e 100644
--- a/engines/glk/frotz/frotz_types.h
+++ b/engines/glk/frotz/frotz_types.h
@@ -85,6 +85,7 @@ enum Story {
ARTHUR,
JOURNEY,
LURKING_HORROR,
+ MILLIWAYS,
UNKNOWN
};
diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index 8bbd154360..e01e892846 100644
--- a/engines/glk/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -242,7 +242,7 @@ bool GlkInterface::initPictures() {
return true;
}
- if (h_version == V6)
+ if (h_version == V6 && _storyId != MILLIWAYS)
error("Could not locate MG1 file");
return false;
}
More information about the Scummvm-git-logs
mailing list