[Scummvm-git-logs] scummvm master -> 93b0b0f7c17dcc51e7349fc2630b501a874a4dd8
bluegr
bluegr at gmail.com
Sun Jan 26 19:59:43 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1207364198 WINTERMUTE: Fix knownPrefix for Tanya Grotter 2
1805d40b8b WINTERMUTE: Add 5 more knownPrefixes for file seeking
93b0b0f7c1 WINTERMUTE: Add known absolute EDITOR_BG_FILE paths and prefixes
Commit: 1207364198830c080f1afa78e81cfb421d572f5e
https://github.com/scummvm/scummvm/commit/1207364198830c080f1afa78e81cfb421d572f5e
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2020-01-26T21:59:38+02:00
Commit Message:
WINTERMUTE: Fix knownPrefix for Tanya Grotter 2
Octal bytes are now used instead of incorrect pseudo-hex writing.
Changed paths:
engines/wintermute/base/file/base_disk_file.cpp
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index c4883e2..ec44685 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -122,7 +122,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
const char* const knownPrefixes[] = { // Known absolute paths
"c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf"
"c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
- "d:/engine/\0xD2\0xC32/tg_ie_080128_1005/data/", // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<\0xD2><\0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
+ "d:/engine/\322\3032/tg_ie_080128_1005/data/", // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<0xD2><0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
"f:/dokument/spel 5/demo/data/" // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"
};
Commit: 1805d40b8bdaa093f42b2c3702aced385030f7f0
https://github.com/scummvm/scummvm/commit/1805d40b8bdaa093f42b2c3702aced385030f7f0
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2020-01-26T21:59:38+02:00
Commit Message:
WINTERMUTE: Add 5 more knownPrefixes for file seeking
Changed paths:
engines/wintermute/base/file/base_disk_file.cpp
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index ec44685..ffd68e8 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -120,10 +120,15 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
// We try to turn the known ones into relative paths.
if (fixedFilename.contains(':')) {
const char* const knownPrefixes[] = { // Known absolute paths
+ "c:/documents and settings/radimk/plocha/projekt/", // Basis Octavus refers to several files named "c:\documents and settings\radimk\plocha\projekt\sprites\clock*.bmp"
+ "c:/program files/wme devkit beta/projects/amu/data/", // Five Magical Amulets refers to "c:\program files\wme devkit beta\projects\amu\data\scenes\prvnimenu\scr\scene_init.script"
+ "c:/users/mathieu/desktop/wintermute engine development kit/jeu verve/vervegame/data/", // Machu Mayu refers to "c:\users\mathieu\desktop\wintermute engine development kit\jeu verve\vervegame\data\interface\system\cr<0xE9>dits.script"
"c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf"
"c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
"d:/engine/\322\3032/tg_ie_080128_1005/data/", // Tanya Grotter and the Disappearing Floor refers to "d:\engine\<0xD2><0xC3>2\tg_ie_080128_1005\data\interface\pixel\pixel.png"
- "f:/dokument/spel 5/demo/data/" // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"
+ "e:/users/jonathan/onedrive/knossos/data/", // K'NOSSOS refers to "e:\users\jonathan\onedrive\knossos\data\entities\helprobot\helprobot.script"
+ "f:/dokument/spel 5/demo/data/", // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"
+ "f:/quest!!!/engine/quest/data/" // Book of Gron Part One refers to several files named "f:\quest!!!\engine\quest\data\entities\dver\*"
};
bool matched = false;
Commit: 93b0b0f7c17dcc51e7349fc2630b501a874a4dd8
https://github.com/scummvm/scummvm/commit/93b0b0f7c17dcc51e7349fc2630b501a874a4dd8
Author: lolbot-iichan (lolbot_iichan at mail.ru)
Date: 2020-01-26T21:59:38+02:00
Commit Message:
WINTERMUTE: Add known absolute EDITOR_BG_FILE paths and prefixes
EDITOR_BG_FILE path is currently ignored, so this is useless now,
however it may come handy in some deep future, if something like a
sprite viewer would be implemented.
Changed paths:
engines/wintermute/base/file/base_disk_file.cpp
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index ffd68e8..7d09b3d 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -131,6 +131,24 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
"f:/quest!!!/engine/quest/data/" // Book of Gron Part One refers to several files named "f:\quest!!!\engine\quest\data\entities\dver\*"
};
+ // There are also some EDITOR_BG_FILE paths that refer to absolute paths
+ // However, EDITOR_BG_FILE is out of ScummVM scope, so there is currently no need to check for those prefixes:
+ // "c:\documents and settings\kumilanka\desktop\white.png" is used as EDITOR_BG_FILE at Alpha Polaris
+ // "c:\documents and settings\nir\desktop\untitled111.bmp" is used as EDITOR_BG_FILE at Pizza Morgana: Episode 1 - Monsters and Manipulations in the Magical Forest
+ // "c:\documents and settings\user\desktop\untitled111.bmp" is used as EDITOR_BG_FILE at Pizza Morgana: Episode 1 - Monsters and Manipulations in the Magical Forest
+ // "c:\dokumente und einstellungen\frank\desktop\position_qualm_auf_kaputter_jungfrau_2.png" is used as EDITOR_BG_FILE at 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
+ // "c:\tib_forest_d_2007120_111637000.jpg" is used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+ // "c:\<0xC1><0xE5><0xE7><0xFB><0xEC><0xFF><0xED><0xFB><0xE9>.bmp" is used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+ // "d:\projects\dirty split\tempfolder\background\sprite_help.png" is used as EDITOR_BG_FILE at Dirty Split
+ // "d:\<0xCE><0xE1><0xEC><0xE5><0xED>\*" are used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+ // "e:\pictures\fraps screenshot\*" are used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+ // "e:\work\!<0xC4><0xE5><0xEB><0xE0>\1 computergames\6 gamelet\work\*" are used as EDITOR_BG_FILE at Hamlet or the last game without MMORPG features, shaders and product placement
+ // "e:\<0xC4><0xE5><0xE5><0xE2>\graphics\*" are used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+ // "f:\quest!!!\*" are used as EDITOR_BG_FILE at Book of Gron Part One
+ // "f:\<0xD2><0xE5><0xEA><0xF1><0xF2><0xF3><0xF0><0xFB>\<0xE1><0xEE><0xF2><0xE0><0xED><0xE8><0xEA><0xE0>\index\barks.jpg" is used as EDITOR_BG_FILE at Tanya Grotter and the Disappearing Floor
+ // "g:\<0xC4><0xEE><0xEA><0xF3><0xEC><0xE5><0xED><0xF2><0xFB>\<0xCF><0xF0><0xEE><0xE5><0xEA><0xF2><0xFB>\<0xD2><0xE8><0xC1>\*" are used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+ // "untitled-1.jpg" & "untitled-1.png" with very various paths (including "c:\untitled-1.jpg" and "d:\untitled-1.jpg") are also used as EDITOR_BG_FILE at Fairy Tales About Toshechka and Boshechka
+
bool matched = false;
for (uint i = 0; i < ARRAYSIZE(knownPrefixes); i++) {
More information about the Scummvm-git-logs
mailing list