diff options
| author | Max Horn | 2007-02-17 20:38:27 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-17 20:38:27 +0000 |
| commit | b777c09ac0271f9b41e445dbc74e7f5afe400bc6 (patch) | |
| tree | 61aabb7143bb0cee329bb3326c1d14417adb422c | |
| parent | d0f6b3c0dcd59c7b156c940ae427ac761f779895 (diff) | |
| download | scummvm-rg350-b777c09ac0271f9b41e445dbc74e7f5afe400bc6.tar.gz scummvm-rg350-b777c09ac0271f9b41e445dbc74e7f5afe400bc6.tar.bz2 scummvm-rg350-b777c09ac0271f9b41e445dbc74e7f5afe400bc6.zip | |
Removed some dead code, updated a warning message
svn-id: r25662
| -rw-r--r-- | engines/scumm/resource.cpp | 4 | ||||
| -rw-r--r-- | engines/sword2/music.cpp | 2 | ||||
| -rw-r--r-- | engines/sword2/resman.cpp | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index 1be391245f..1af71d5c0d 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -1325,11 +1325,7 @@ void ScummEngine::dumpResource(const char *tag, int idx, const byte *ptr, int le else size = READ_BE_UINT32(ptr + 4); -#if defined(MACOS_CARBON) - sprintf(buf, ":dumps:%s%d.dmp", tag, idx); -#else sprintf(buf, "dumps/%s%d.dmp", tag, idx); -#endif out.open(buf, Common::File::kFileWriteMode); if (out.isOpen() == false) diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index c13c5532d4..7ca7f685d3 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -90,7 +90,7 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, fh->file.open(filename); fh->fileType = soundMode; if (!fh->file.isOpen()) { - warning("Very strange fopen error"); + warning("BS2 getAudioStream: Failed opening file '%s'", filename); return NULL; } if (fh->fileSize != fh->file.size()) { diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index a5eeb4a216..cd482cc9f5 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -328,11 +328,7 @@ byte *ResourceManager::openResource(uint32 res, bool dump) { break; } -#if defined(MACOS_CARBON) - sprintf(buf, ":dumps:%s-%d.dmp", tag, res); -#else sprintf(buf, "dumps/%s-%d.dmp", tag, res); -#endif if (!Common::File::exists(buf)) { if (out.open(buf, Common::File::kFileWriteMode)) |