[Scummvm-cvs-logs] scummvm master -> 2a2a5e51c6ae7ad77bcf16339982353a5b424b10

sev- sev at scummvm.org
Sun Sep 29 08:31:11 CEST 2013


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:
2a2a5e51c6 SWORD25: Fix Amiga compilation


Commit: 2a2a5e51c6ae7ad77bcf16339982353a5b424b10
    https://github.com/scummvm/scummvm/commit/2a2a5e51c6ae7ad77bcf16339982353a5b424b10
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-28T23:30:23-07:00

Commit Message:
SWORD25: Fix Amiga compilation

Changed paths:
    engines/sword25/input/inputengine.cpp
    engines/sword25/kernel/inputpersistenceblock.cpp



diff --git a/engines/sword25/input/inputengine.cpp b/engines/sword25/input/inputengine.cpp
index bb9c2c8..57fb6df 100644
--- a/engines/sword25/input/inputengine.cpp
+++ b/engines/sword25/input/inputengine.cpp
@@ -235,13 +235,13 @@ bool InputEngine::persist(OutputPersistenceBlock &writer) {
 	// Write out the number of command callbacks and their names.
 	// Note: We do this only for compatibility with older engines resp.
 	// the original engine.
-	writer.write((uint)1);
+	writer.write((uint32)1);
 	writer.writeString("LuaCommandCB");
 
 	// Write out the number of command callbacks and their names.
 	// Note: We do this only for compatibility with older engines resp.
 	// the original engine.
-	writer.write((uint)1);
+	writer.write((uint32)1);
 	writer.writeString("LuaCharacterCB");
 
 	return true;
@@ -253,7 +253,7 @@ bool InputEngine::unpersist(InputPersistenceBlock &reader) {
 	// Read number of command callbacks and their names.
 	// Note: We do this only for compatibility with older engines resp.
 	// the original engine.
-	uint commandCallbackCount;
+	uint32 commandCallbackCount;
 	reader.read(commandCallbackCount);
 	assert(commandCallbackCount == 1);
 
diff --git a/engines/sword25/kernel/inputpersistenceblock.cpp b/engines/sword25/kernel/inputpersistenceblock.cpp
index 459cddf..aa3a759 100644
--- a/engines/sword25/kernel/inputpersistenceblock.cpp
+++ b/engines/sword25/kernel/inputpersistenceblock.cpp
@@ -48,7 +48,7 @@ InputPersistenceBlock::~InputPersistenceBlock() {
 }
 
 void InputPersistenceBlock::read(int16 &value) {
-	signed int v;
+	int32 v;
 	read(v);
 	value = static_cast<int16>(v);
 }
@@ -96,7 +96,7 @@ void InputPersistenceBlock::readString(Common::String &value) {
 	value = "";
 
 	if (checkMarker(STRING_MARKER)) {
-		uint size;
+		uint32 size;
 		read(size);
 
 		if (checkBlockSize(size)) {
@@ -108,7 +108,7 @@ void InputPersistenceBlock::readString(Common::String &value) {
 
 void InputPersistenceBlock::readByteArray(Common::Array<byte> &value) {
 	if (checkMarker(BLOCK_MARKER)) {
-		uint size;
+		uint32 size;
 		read(size);
 
 		if (checkBlockSize(size)) {






More information about the Scummvm-git-logs mailing list