diff options
author | Nicola Mettifogo | 2008-01-31 10:38:15 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2008-01-31 10:38:15 +0000 |
commit | ccc0f6b92d9295e04b4b701a19e8bb125338c6be (patch) | |
tree | d399e608367e6ea20d515da06777f2cb608897e7 /engines | |
parent | f2a16e4f56443ad4b8a6eda7b8685bf3b1d94cc5 (diff) | |
download | scummvm-rg350-ccc0f6b92d9295e04b4b701a19e8bb125338c6be.tar.gz scummvm-rg350-ccc0f6b92d9295e04b4b701a19e8bb125338c6be.tar.bz2 scummvm-rg350-ccc0f6b92d9295e04b4b701a19e8bb125338c6be.zip |
Slightly simplified Archive selection when loading resources.
svn-id: r30714
Diffstat (limited to 'engines')
-rw-r--r-- | engines/parallaction/disk_ns.cpp | 13 | ||||
-rw-r--r-- | engines/parallaction/gui_ns.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 2 |
3 files changed, 3 insertions, 16 deletions
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index 24209c411e..c6fad9765c 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -1252,18 +1252,7 @@ void AmigaDisk_ns::loadScenery(BackgroundInfo& info, const char* background, con void AmigaDisk_ns::loadSlide(BackgroundInfo& info, const char *name) { debugC(1, kDebugDisk, "AmigaDisk_ns::loadSlide '%s'", name); - - char path[PATH_LEN]; - sprintf(path, "slides/%s", name); - Common::SeekableReadStream *s = openArchivedFile(path, false); - - if (s) - loadBackground(info, path); - else - loadBackground(info, name); - - delete s; - + loadBackground(info, name); return; } diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp index d01e2f274c..fec5695413 100644 --- a/engines/parallaction/gui_ns.cpp +++ b/engines/parallaction/gui_ns.cpp @@ -123,7 +123,7 @@ enum { void Parallaction_ns::guiStart() { - _disk->selectArchive((getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0"); + _disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1"); guiSplash(); @@ -386,7 +386,7 @@ int Parallaction_ns::guiSelectCharacter() { setArrowCursor(); _soundMan->stopMusic(); - _disk->selectArchive((getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0"); + _disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1"); showSlide("password"); diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index fa7fc11237..5c8e8e5113 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -366,8 +366,6 @@ void Parallaction_ns::changeCharacter(const char *name) { if (!_char.dummy()) { if (getPlatform() == Common::kPlatformAmiga) { _disk->selectArchive("disk0"); - } else { - _disk->selectArchive("disk1"); } _char._head = _disk->loadHead(_char.getBaseName()); |