aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorMax Horn2007-02-17 20:38:27 +0000
committerMax Horn2007-02-17 20:38:27 +0000
commitb777c09ac0271f9b41e445dbc74e7f5afe400bc6 (patch)
tree61aabb7143bb0cee329bb3326c1d14417adb422c /engines/sword2
parentd0f6b3c0dcd59c7b156c940ae427ac761f779895 (diff)
downloadscummvm-rg350-b777c09ac0271f9b41e445dbc74e7f5afe400bc6.tar.gz
scummvm-rg350-b777c09ac0271f9b41e445dbc74e7f5afe400bc6.tar.bz2
scummvm-rg350-b777c09ac0271f9b41e445dbc74e7f5afe400bc6.zip
Removed some dead code, updated a warning message
svn-id: r25662
Diffstat (limited to 'engines/sword2')
-rw-r--r--engines/sword2/music.cpp2
-rw-r--r--engines/sword2/resman.cpp4
2 files changed, 1 insertions, 5 deletions
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))