From 19b07a7c125b40d42996e1c943131504649b97eb Mon Sep 17 00:00:00 2001 From: Walter van Niftrik Date: Mon, 27 Feb 2017 22:12:46 +0100 Subject: ADL: Move multi-disk handling into v2 --- engines/adl/adl_v4.cpp | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'engines/adl/adl_v4.cpp') diff --git a/engines/adl/adl_v4.cpp b/engines/adl/adl_v4.cpp index e8ee798199..c06099b98d 100644 --- a/engines/adl/adl_v4.cpp +++ b/engines/adl/adl_v4.cpp @@ -20,15 +20,15 @@ * */ +#include "common/error.h" + #include "adl/adl_v4.h" #include "adl/display.h" -#include "adl/detection.h" namespace Adl { AdlEngine_v4::AdlEngine_v4(OSystem *syst, const AdlGameDescription *gd) : AdlEngine_v3(syst, gd), - _currentVolume(0), _itemPicIndex(nullptr) { } @@ -190,26 +190,6 @@ Common::String AdlEngine_v4::getItemDescription(const Item &item) const { return _itemDesc[item.id - 1]; } -Common::String AdlEngine_v4::getDiskImageName(byte volume) const { - const ADGameFileDescription *ag; - - for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) - if (ag->fileType == volume) - return ag->fileName; - - error("Disk volume %d not found", volume); -} - -void AdlEngine_v4::insertDisk(byte volume) { - delete _disk; - _disk = new DiskImage(); - - if (!_disk->open(getDiskImageName(volume))) - error("Failed to open disk volume %d", volume); - - _currentVolume = volume; -} - void AdlEngine_v4::loadRegionLocations(Common::ReadStream &stream, uint regions) { for (uint r = 0; r < regions; ++r) { RegionLocation loc; -- cgit v1.2.3