diff options
| author | Willem Jan Palenstijn | 2013-09-30 22:05:32 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-30 22:05:32 +0200 |
| commit | 8e58be7a1d39d8235ddd7beb876de1ff3988fca5 (patch) | |
| tree | 64cebc37a319e17299a6a37a8b13b35742174d58 /engines/sword25/kernel/inputpersistenceblock.cpp | |
| parent | 057b01951a92cc17e6c7a5121d2bd866841c4f75 (diff) | |
| parent | 17df6b343a0fdb2168b4d3a22927cd0f584ce735 (diff) | |
| download | scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.gz scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.bz2 scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.zip | |
Merge branch 'master' into wme_rendering
Diffstat (limited to 'engines/sword25/kernel/inputpersistenceblock.cpp')
| -rw-r--r-- | engines/sword25/kernel/inputpersistenceblock.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/kernel/inputpersistenceblock.cpp b/engines/sword25/kernel/inputpersistenceblock.cpp index 0fe5d88b80..aa3a759756 100644 --- a/engines/sword25/kernel/inputpersistenceblock.cpp +++ b/engines/sword25/kernel/inputpersistenceblock.cpp @@ -48,12 +48,12 @@ InputPersistenceBlock::~InputPersistenceBlock() { } void InputPersistenceBlock::read(int16 &value) { - signed int v; + int32 v; read(v); value = static_cast<int16>(v); } -void InputPersistenceBlock::read(signed int &value) { +void InputPersistenceBlock::read(int32 &value) { if (checkMarker(SINT_MARKER)) { value = (int32)READ_LE_UINT32(_iter); _iter += 4; @@ -62,7 +62,7 @@ void InputPersistenceBlock::read(signed int &value) { } } -void InputPersistenceBlock::read(uint &value) { +void InputPersistenceBlock::read(uint32 &value) { if (checkMarker(UINT_MARKER)) { value = READ_LE_UINT32(_iter); _iter += 4; @@ -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)) { |