[Scummvm-cvs-logs] scummvm master -> 6cc469dc5c1021764f0cf4a4e0a46e83f760ae5f

eriktorbjorn eriktorbjorn at telia.com
Sun Jun 7 17:20:33 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6cc469dc5c SHERLOCK: Fix GCC compilation


Commit: 6cc469dc5c1021764f0cf4a4e0a46e83f760ae5f
    https://github.com/scummvm/scummvm/commit/6cc469dc5c1021764f0cf4a4e0a46e83f760ae5f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-07T17:19:05+02:00

Commit Message:
SHERLOCK: Fix GCC compilation

Changed paths:
    engines/sherlock/animation.cpp
    engines/sherlock/resources.cpp



diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index bc0e337..a069abe 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -150,7 +150,7 @@ bool Animation::play3DO(const Common::String &filename, int minDelay, int fade,
 	Common::File *indexStream = new Common::File();
 
 	if (!indexStream->open(indexName)) {
-		warning("unable to open %s\n", indexName);
+		warning("unable to open %s\n", indexName.c_str());
 		return false;
 	}
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index d98d3d8..a5f7ba4 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -580,7 +580,7 @@ ImageFile3DO::ImageFile3DO(const Common::String &name, bool animImages) {
 	Common::File *dataStream = new Common::File();
 
 	if (!dataStream->open(name)) {
-		error("unable to open %s\n", name);
+		error("unable to open %s\n", name.c_str());
 	}
 
 	load(*dataStream, animImages);






More information about the Scummvm-git-logs mailing list