[Scummvm-cvs-logs] scummvm master -> fd312ddfe39e4093a58e2b4e12c5476bb9bdc8a1

[lordhoto]

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

Summary:
4349ee8b3b SCUMM: Fix some GCC warnings.
fd312ddfe3 KYRA: Slight formatting fix.


Commit: 4349ee8b3bca1bf1d3185bcd3862c131d4d37637
    https://github.com/scummvm/scummvm/commit/4349ee8b3bca1bf1d3185bcd3862c131d4d37637
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-17T18:27:23-08:00

Commit Message:
SCUMM: Fix some GCC warnings.

Changed paths:
    engines/scumm/he/script_v60he.cpp



diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 4901d47..409fb7e 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -91,7 +91,7 @@ void ScummEngine_v60he::setupOpcodes() {
 }
 
 Common::String ScummEngine_v60he::convertFilePath(const byte *src) {
-	debug(2, "convertFilePath in: '%s'", (char *)src);
+	debug(2, "convertFilePath in: '%s'", (const char *)src);
 
 	int srcSize = resStrLen(src);
 	int start = 0;
@@ -140,7 +140,7 @@ Common::String ScummEngine_v60he::convertFilePath(const byte *src) {
 }
 
 Common::String ScummEngine_v60he::convertSavePath(const byte *src) {
-	debug(2, "convertSavePath in: '%s'", (char *)src);
+	debug(2, "convertSavePath in: '%s'", (const char *)src);
 
 	Common::String filePath = convertFilePath(src);
 
@@ -174,17 +174,17 @@ Common::String ScummEngine_v60he::convertSavePathOld(const byte *src) {
 	if (src[0] == 'u' && src[1] == 's') {
 		// Save Game Path (Moonbase Commander)
 		// The default save path is 'user/'
-		return (char *)src + 5;
+		return (const char *)src + 5;
 	} else if (src[0] == '*' && (src[1] == '\\' || src[1] == ':')) {
 		// Save Game Path (HE72 - HE100)
 		// The default save game path is set to '*\\' by ScummVM for Windows
 		// and '*:' for Macintosh
-		return (char *)src + 2;
+		return (const char *)src + 2;
 	} else if (src[0] == 'c' && src[1] == ':') {
 		// The default save path is game path (DOS) or 'c:\\hegames\\' (Windows)
 		for (int i = srcSize; i > 0; i--)
 			if (src[i] == '\\')
-				return (char *)src + i + 1;
+				return (const char *)src + i + 1;
 	}
 
 	// Can't reach here
@@ -256,7 +256,7 @@ Common::WriteStream *ScummEngine_v60he::openSaveFileForAppending(const byte *fil
 
 	if (!output) {
 		delete[] initialData;
-		return false;
+		return nullptr;
 	}
 
 	if (initialData) {


Commit: fd312ddfe39e4093a58e2b4e12c5476bb9bdc8a1
    https://github.com/scummvm/scummvm/commit/fd312ddfe39e4093a58e2b4e12c5476bb9bdc8a1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-17T18:27:57-08:00

Commit Message:
KYRA: Slight formatting fix.

Changed paths:
    engines/kyra/vqa.cpp



diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index 40da6f1..d9564e1 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -224,7 +224,7 @@ void VQADecoder::handleFINF(Common::SeekableReadStream *stream) {
 	_frameInfo[_header.numFrames] = 0x7FFFFFFF;
 }
 
-void  VQADecoder::readNextPacket() {
+void VQADecoder::readNextPacket() {
 	VQAVideoTrack *videoTrack = (VQAVideoTrack *)getTrack(0);
 	VQAAudioTrack *audioTrack = (VQAAudioTrack *)getTrack(1);