diff options
| author | Max Horn | 2006-05-01 22:27:56 +0000 |
|---|---|---|
| committer | Max Horn | 2006-05-01 22:27:56 +0000 |
| commit | 84b2a4f76fed5848b8a4ff49fd2fcfd9604a0c92 (patch) | |
| tree | 1b78cfc1ea03c9ad8ac00c6a21a6b2454d320105 /engines/sky | |
| parent | dbe1c50bc9ce6e54115b7784585310ebb5433985 (diff) | |
| download | scummvm-rg350-84b2a4f76fed5848b8a4ff49fd2fcfd9604a0c92.tar.gz scummvm-rg350-84b2a4f76fed5848b8a4ff49fd2fcfd9604a0c92.tar.bz2 scummvm-rg350-84b2a4f76fed5848b8a4ff49fd2fcfd9604a0c92.zip | |
It's wrong to assume a given file is located in gameDataPath, so do not use that to print out warnings that pretend otherwise
svn-id: r22272
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/disk.cpp | 6 | ||||
| -rw-r--r-- | engines/sky/disk.h | 2 | ||||
| -rw-r--r-- | engines/sky/sky.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 0a543ecb3b..8e0779ef55 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -35,13 +35,13 @@ namespace Sky { static const char *dataFilename = "sky.dsk"; static const char *dinnerFilename = "sky.dnr"; -Disk::Disk(const Common::String &gameDataPath) { +Disk::Disk() { _dataDiskHandle = new Common::File(); _dnrHandle = new Common::File(); _dnrHandle->open(dinnerFilename); if (!_dnrHandle->isOpen()) - error("Could not open %s%s", gameDataPath.c_str(), dinnerFilename); + error("Could not open %s", dinnerFilename); if (!(_dinnerTableEntries = _dnrHandle->readUint32LE())) error("Error reading from sky.dnr"); //even though it was opened correctly?! @@ -54,7 +54,7 @@ Disk::Disk(const Common::String &gameDataPath) { _dataDiskHandle->open(dataFilename); if (!_dataDiskHandle->isOpen()) - error("Error opening %s%s", gameDataPath.c_str(), dataFilename); + error("Error opening %s", dataFilename); printf("Found BASS version v0.0%d (%d dnr entries)\n", determineGameVersion(), _dinnerTableEntries); diff --git a/engines/sky/disk.h b/engines/sky/disk.h index 4d2fe4c294..91d69c49d8 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -38,7 +38,7 @@ namespace Sky { class Disk { public: - Disk(const Common::String &gameDataPath); + Disk(); ~Disk(void); uint8 *loadFile(uint16 fileNr); diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 941f9df017..7c260445c5 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -323,7 +323,7 @@ int SkyEngine::init() { _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); _floppyIntro = ConfMan.getBool("alt_intro"); - _skyDisk = new Disk(_gameDataPath); + _skyDisk = new Disk(); _skySound = new Sound(_mixer, _skyDisk, ConfMan.getInt("sfx_volume")); _systemVars.gameVersion = _skyDisk->determineGameVersion(); |