diff options
| author | Eugene Sandulenko | 2013-09-29 09:30:23 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-29 09:30:23 +0300 |
| commit | 2a2a5e51c6ae7ad77bcf16339982353a5b424b10 (patch) | |
| tree | daeacea577fabcc04883108788ff066be0d64613 /engines/sword25 | |
| parent | befa99ca7761370e9f11c425b459d410d371723f (diff) | |
| download | scummvm-rg350-2a2a5e51c6ae7ad77bcf16339982353a5b424b10.tar.gz scummvm-rg350-2a2a5e51c6ae7ad77bcf16339982353a5b424b10.tar.bz2 scummvm-rg350-2a2a5e51c6ae7ad77bcf16339982353a5b424b10.zip | |
SWORD25: Fix Amiga compilation
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/input/inputengine.cpp | 6 | ||||
| -rw-r--r-- | engines/sword25/kernel/inputpersistenceblock.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/input/inputengine.cpp b/engines/sword25/input/inputengine.cpp index bb9c2c8b40..57fb6dfc09 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 459cddf347..aa3a759756 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)) { |