diff options
| author | Vincent Hamm | 2002-02-12 22:25:41 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2002-02-12 22:25:41 +0000 |
| commit | 2fe9e07bc7b9188b53ad0d35cdae363483176206 (patch) | |
| tree | c50fc3b95ed1c1197315ee8dc8cb296d7b5cfb52 | |
| parent | 7f9aef79fa2c1958fb530210d37a7241ba1c2055 (diff) | |
| download | scummvm-rg350-2fe9e07bc7b9188b53ad0d35cdae363483176206.tar.gz scummvm-rg350-2fe9e07bc7b9188b53ad0d35cdae363483176206.tar.bz2 scummvm-rg350-2fe9e07bc7b9188b53ad0d35cdae363483176206.zip | |
*** empty log message ***
svn-id: r3570
| -rw-r--r-- | resource.cpp | 9 | ||||
| -rw-r--r-- | scumm.h | 1 | ||||
| -rw-r--r-- | scummvm.cpp | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/resource.cpp b/resource.cpp index d1f9e71874..8f68a3822a 100644 --- a/resource.cpp +++ b/resource.cpp @@ -67,11 +67,12 @@ void Scumm::openRoom(int room) { _encbyte = (_features & GF_USE_KEY) ? 0x69 : 0; #else if (!(_features & GF_SMALL_HEADER)) { - sprintf(buf, "%s.%.3d", _exe_name, room==0 ? 0 : res.roomno[rtRoom][room]); + sprintf(buf, "%s//%s.%.3d", _exe_name, _exe_name, room==0 ? 0 : res.roomno[rtRoom][room]); + _encbyte = (_features & GF_USE_KEY) ? 0x69 : 0; } else if(!(_features & GF_SMALL_NAMES)) { if(room==0 || room>=900) { - sprintf(buf, "%s\\%.3d.lfl",_exe_name,room); + sprintf(buf, "%s//%.3d.lfl",_exe_name,room); _encbyte = 0; if (openResourceFile(buf)) { return; @@ -79,11 +80,11 @@ void Scumm::openRoom(int room) { askForDisk(buf); } else { - sprintf(buf, "%s\\disk%.2d.lec",_exe_name,res.roomno[rtRoom][room]); + sprintf(buf, "%s//disk%.2d.lec",_exe_name,res.roomno[rtRoom][room]); _encbyte = 0x69; } } else { - sprintf(buf, "%s\\%.2d.lfl",_exe_name,room); + sprintf(buf, "%s//%.2d.lfl",_exe_name,room); if(_features & GF_OLD_BUNDLE) _encbyte = 0xFF; else @@ -926,6 +926,7 @@ enum GameFeatures { GF_OLD_BUNDLE = 128, GF_16COLOR = 256, GF_OLD256 = 512, + GF_AUDIOTRACKS = 1024, }; struct ScummDebugger; diff --git a/scummvm.cpp b/scummvm.cpp index 3c4af0fdad..caa238dc00 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -271,7 +271,7 @@ int Scumm::scummLoop(int delta) { _vars[VAR_MOUSE_Y] = mouse.y; _vars[VAR_DEBUGMODE] = _debugMode; - if (_gameId==GID_MONKEY) + if (_features & GF_AUDIOTRACKS) _vars[VAR_MI1_TIMER]+=40; if (_saveLoadFlag) { @@ -443,8 +443,8 @@ static const VersionSettings version_settings[] = { {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, 0, 67, GF_SMALL_HEADER|GF_USE_KEY|GF_16COLOR}, // EGA version /* Scumm version 5 */ - {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42, GF_SMALL_HEADER|GF_USE_KEY}, - {"monkey", "Monkey Island 1", GID_MONKEY, 5, 2, 2, GF_USE_KEY}, + {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42, GF_SMALL_HEADER|GF_USE_KEY|GF_AUDIOTRACKS}, + {"monkey", "Monkey Island 1", GID_MONKEY, 5, 2, 2, GF_USE_KEY|GF_AUDIOTRACKS}, {"monkey2", "Monkey Island 2: LeChuck's revenge", GID_MONKEY2, 5, 2, 2, GF_USE_KEY}, {"atlantis", "Indiana Jones 4 and the Fate of Atlantis", GID_INDY4, 5, 5, 0, GF_USE_KEY}, {"playfate", "Indiana Jones 4 and the Fate of Atlantis (Demo)", GID_INDY4, 5, 5, 0, GF_USE_KEY}, |