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/parse_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/parse_v2.cpp')
| -rw-r--r-- | engines/gob/parse_v2.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp index 63aaadb8e4..982b6d09a2 100644 --- a/engines/gob/parse_v2.cpp +++ b/engines/gob/parse_v2.cpp @@ -178,12 +178,12 @@ int16 Parse_v2::parseValExpr(unsigned stopToken) { break; case 21: - *valPtr = *_vm->_global->_inter_execPtr++; + *valPtr = *((int8 *) _vm->_global->_inter_execPtr++); break; case 23: case 24: - *valPtr = *(uint16*)(_vm->_global->_inter_variables + _vm->_inter->load16() * 4); + *valPtr = VAR(_vm->_inter->load16()); break; case 25: @@ -435,7 +435,7 @@ int16 Parse_v2::parseExpr(char stopToken, byte *arg_2) { case 21: *operPtr = 20; - *valPtr = *_vm->_global->_inter_execPtr++; + *valPtr = *((int8 *) _vm->_global->_inter_execPtr++); break; case 22: @@ -445,13 +445,9 @@ int16 Parse_v2::parseExpr(char stopToken, byte *arg_2) { break; case 23: - *operPtr = 20; - *valPtr = VAR(_vm->_inter->load16()); - break; - case 24: *operPtr = 20; - *valPtr = *(uint16*)(_vm->_global->_inter_variables + _vm->_inter->load16() * 4); + *valPtr = VAR(_vm->_inter->load16()); break; case 25: |