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

[wjp]

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:
4931aee954 ZVISION: Fix typo
c823a6e825 ZVISION: Fix cmdRawToWav on BE systems


Commit: 4931aee954704a7ee984ce8cee85bdbec3ddb640
    https://github.com/scummvm/scummvm/commit/4931aee954704a7ee984ce8cee85bdbec3ddb640
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-12-27T23:51:59+01:00

Commit Message:
ZVISION: Fix typo

Changed paths:
    engines/zvision/graphics/cursors/cursor.cpp
    engines/zvision/graphics/render_manager.cpp



diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index 1b471d8..f32c686 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -61,7 +61,7 @@ ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
 	assert(bytesRead == dataSize);
 
-#ifndef SCUMMVM_LITTLE_ENDIAN
+#ifndef SCUMM_LITTLE_ENDIAN
 	int16 *buffer = (int16 *)_surface.getPixels();
 	for (uint32 i = 0; i < dataSize / 2; ++i)
 		buffer[i] = FROM_LE_16(buffer[i]);
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index a178c97..033d099 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -216,7 +216,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 		LzssReadStream lzssStream(&file);
 		buffer = (uint16 *)(new uint16[decompressedSize]);
 		lzssStream.read(buffer, 2 * decompressedSize);
-#ifndef SCUMMVM_LITTLE_ENDIAN
+#ifndef SCUMM_LITTLE_ENDIAN
 		for (uint32 i = 0; i < decompressedSize; ++i)
 			buffer[i] = FROM_LE_16(buffer[i]);
 #endif


Commit: c823a6e825a6474c75f1ddecfcb67a602393fae6
    https://github.com/scummvm/scummvm/commit/c823a6e825a6474c75f1ddecfcb67a602393fae6
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-12-27T23:52:18+01:00

Commit Message:
ZVISION: Fix cmdRawToWav on BE systems

Changed paths:
    engines/zvision/core/console.cpp



diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index c7592c8..b5e542d 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -138,6 +138,10 @@ bool Console::cmdRawToWav(int argc, const char **argv) {
 	output.writeUint32LE(file.size() * 2);
 	int16 *buffer = new int16[file.size()];
 	audioStream->readBuffer(buffer, file.size());
+#ifndef SCUMM_LITTLE_ENDIAN
+	for (int i = 0; i < file.size(); ++i)
+		buffer[i] = TO_LE_16(buffer[i]);
+#endif
 	output.write(buffer, file.size() * 2);
 
 	delete[] buffer;