diff options
| author | Sven Hesse | 2006-06-04 17:24:03 +0000 |
|---|---|---|
| committer | Sven Hesse | 2006-06-04 17:24:03 +0000 |
| commit | b5bc1c82fa1e22091d5cfffa1217348acff8d0b2 (patch) | |
| tree | acddbddf84bdd53fcb4d1f142707a6b2f7498f3a /engines/gob/map_v2.cpp | |
| parent | f57f02482208638d6c29bd740cc3090b993e1312 (diff) | |
| download | scummvm-rg350-b5bc1c82fa1e22091d5cfffa1217348acff8d0b2.tar.gz scummvm-rg350-b5bc1c82fa1e22091d5cfffa1217348acff8d0b2.tar.bz2 scummvm-rg350-b5bc1c82fa1e22091d5cfffa1217348acff8d0b2.zip | |
- Fixed endianness/signess issues
- Added a memset in Video_v2::SpriteUncompressor(), that should have
been there in the first place; this fixes the tree in GOB2's first room
- Fixed ADL delete[]ing
svn-id: r22917
Diffstat (limited to 'engines/gob/map_v2.cpp')
| -rw-r--r-- | engines/gob/map_v2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp index 6558cd27d9..d5c02fd078 100644 --- a/engines/gob/map_v2.cpp +++ b/engines/gob/map_v2.cpp @@ -59,7 +59,7 @@ void Map_v2::loadMapObjects(char *avjFile) { char *dataPtr; char *dataPtrBak; char *dataPtrBak2; - char statesMask[102]; + int8 statesMask[102]; Goblin::Gob2_State *statesPtr; var = _vm->_parse->parseVarIndex(); @@ -168,13 +168,13 @@ void Map_v2::loadMapObjects(char *avjFile) { _vm->_mult->_objects[i].goblinStates[state][0].field_4 = numData; for (k = 0; k < numData; k++) { dataPtr++; - _vm->_mult->_objects[i].goblinStates[state][k].animation = *dataPtr << 8; + _vm->_mult->_objects[i].goblinStates[state][k].animation = *((byte *) dataPtr) << 8; dataPtr += 2; - _vm->_mult->_objects[i].goblinStates[state][k].animation += *dataPtr; + _vm->_mult->_objects[i].goblinStates[state][k].animation += *((byte *) dataPtr); dataPtr += 2; - _vm->_mult->_objects[i].goblinStates[state][k].layer = *dataPtr << 8; + _vm->_mult->_objects[i].goblinStates[state][k].layer = *((byte *) dataPtr) << 8; dataPtr += 2; - _vm->_mult->_objects[i].goblinStates[state][k].layer += *dataPtr; + _vm->_mult->_objects[i].goblinStates[state][k].layer += *((byte *) dataPtr); _vm->_mult->_objects[i].goblinStates[state][k].field_4 = READ_LE_UINT16(dataPtr); dataPtr += 2; statesPtr++; |