diff options
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index efb5f94b84..90820a6f8f 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -155,9 +155,10 @@ Common::Error Parallaction_ns::init() { strcpy(_location._name, "fognedemo"); } _disk = new AmigaDisk_ns(this); - _disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1"); } + _disk->init(); + if (getPlatform() == Common::kPlatformPC) { int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); MidiDriver *driver = MidiDriver::createMidi(midiDriver); @@ -394,16 +395,11 @@ void Parallaction_ns::changeCharacter(const char *name) { // character for sanity before memory is freed freeCharacter(); - Common::String oldArchive = _disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1"); _char._ani->gfxobj = _gfx->loadAnim(_char.getFullName()); _char._ani->gfxobj->setFlags(kGfxObjCharacter); _char._ani->gfxobj->clearFlags(kGfxObjNormal); if (!_char.dummy()) { - if (getPlatform() == Common::kPlatformAmiga) { - _disk->selectArchive("disk0"); - } - _char._head = _disk->loadHead(_char.getBaseName()); _char._talk = _disk->loadTalk(_char.getBaseName()); _char._objs = _disk->loadObjects(_char.getBaseName()); @@ -420,9 +416,6 @@ void Parallaction_ns::changeCharacter(const char *name) { parseLocation("common"); } - if (!oldArchive.empty()) - _disk->selectArchive(oldArchive); - strcpy(_characterName1, _char.getFullName()); debugC(3, kDebugExec, "changeCharacter: switch completed"); |