[Scummvm-cvs-logs] SF.net SVN: scummvm: [25662] scummvm/trunk/engines

[fingolfin at users.sourceforge.net]

Revision: 25662
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25662&view=rev
Author:   fingolfin
Date:     2007-02-17 12:38:27 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
Removed some dead code, updated a warning message

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/resource.cpp
    scummvm/trunk/engines/sword2/music.cpp
    scummvm/trunk/engines/sword2/resman.cpp

Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp	2007-02-17 20:37:57 UTC (rev 25661)
+++ scummvm/trunk/engines/scumm/resource.cpp	2007-02-17 20:38:27 UTC (rev 25662)
@@ -1325,11 +1325,7 @@
 	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)

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2007-02-17 20:37:57 UTC (rev 25661)
+++ scummvm/trunk/engines/sword2/music.cpp	2007-02-17 20:38:27 UTC (rev 25662)
@@ -90,7 +90,7 @@
 		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()) {

Modified: scummvm/trunk/engines/sword2/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword2/resman.cpp	2007-02-17 20:37:57 UTC (rev 25661)
+++ scummvm/trunk/engines/sword2/resman.cpp	2007-02-17 20:38:27 UTC (rev 25662)
@@ -328,11 +328,7 @@
 				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))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.