[Scummvm-cvs-logs] scummvm master -> 7a669b770f81cbb739f6d45884d898a83fff8a13

sev- sev at scummvm.org
Sun Sep 29 08:46:08 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:
7a669b770f SWORD25: Specifying int size to make Amiga happy


Commit: 7a669b770f81cbb739f6d45884d898a83fff8a13
    https://github.com/scummvm/scummvm/commit/7a669b770f81cbb739f6d45884d898a83fff8a13
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-28T23:45:16-07:00

Commit Message:
SWORD25: Specifying int size to make Amiga happy

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



diff --git a/engines/sword25/input/inputengine.cpp b/engines/sword25/input/inputengine.cpp
index 57fb6df..0d1c449 100644
--- a/engines/sword25/input/inputengine.cpp
+++ b/engines/sword25/input/inputengine.cpp
@@ -263,7 +263,7 @@ bool InputEngine::unpersist(InputPersistenceBlock &reader) {
 	// Read number of character callbacks and their names.
 	// Note: We do this only for compatibility with older engines resp.
 	// the original engine.
-	uint characterCallbackCount;
+	uint32 characterCallbackCount;
 	reader.read(characterCallbackCount);
 	assert(characterCallbackCount == 1);
 
diff --git a/engines/sword25/kernel/outputpersistenceblock.cpp b/engines/sword25/kernel/outputpersistenceblock.cpp
index 48d0ab3..53fb624 100644
--- a/engines/sword25/kernel/outputpersistenceblock.cpp
+++ b/engines/sword25/kernel/outputpersistenceblock.cpp
@@ -74,14 +74,14 @@ void OutputPersistenceBlock::write(bool value) {
 void OutputPersistenceBlock::writeString(const Common::String &string) {
 	writeMarker(STRING_MARKER);
 
-	write(string.size());
+	write((uint32)string.size());
 	rawWrite(string.c_str(), string.size());
 }
 
 void OutputPersistenceBlock::writeByteArray(Common::Array<byte> &value) {
 	writeMarker(BLOCK_MARKER);
 
-	write((uint)value.size());
+	write((uint32)value.size());
 	rawWrite(&value[0], value.size());
 }
 






More information about the Scummvm-git-logs mailing list