diff options
author | Vincent Hamm | 2007-11-10 19:47:07 +0000 |
---|---|---|
committer | Vincent Hamm | 2007-11-10 19:47:07 +0000 |
commit | 34a696662a434fe8afdbee21d7986a88b49208ec (patch) | |
tree | b09401c40c72f06aed1a4bb3f6653d7e606bce74 /engines/cruise/overlay.cpp | |
parent | d624add74243152fa6639ba43cd04f6cfd816447 (diff) | |
download | scummvm-rg350-34a696662a434fe8afdbee21d7986a88b49208ec.tar.gz scummvm-rg350-34a696662a434fe8afdbee21d7986a88b49208ec.tar.bz2 scummvm-rg350-34a696662a434fe8afdbee21d7986a88b49208ec.zip |
Fix boggus object state
svn-id: r29469
Diffstat (limited to 'engines/cruise/overlay.cpp')
-rw-r--r-- | engines/cruise/overlay.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index e0db30bab2..29079d7d9e 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -400,33 +400,34 @@ int loadOverlay(const char *scriptName) { } for (i = 0; i < ovlData->numObj; i++) { - ovlData->arrayObject[i].var0 = *(int16 *) scriptPtr; + ovlData->arrayObject[i]._type = *(int16 *) scriptPtr; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].var0); + flipShort(&ovlData->arrayObject[i]._type); - ovlData->arrayObject[i].type = *(int16 *) scriptPtr; + int16 tempClass = *(int16 *) scriptPtr; + flipShort(&tempClass); + ovlData->arrayObject[i]._class = (eClass)tempClass; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].type); - ovlData->arrayObject[i].var2 = *(int16 *) scriptPtr; + ovlData->arrayObject[i]._nameOffset = *(int16 *) scriptPtr; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].var2); + flipShort(&ovlData->arrayObject[i]._nameOffset); - ovlData->arrayObject[i].var3 = *(int16 *) scriptPtr; + ovlData->arrayObject[i]._numStates = *(int16 *) scriptPtr; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].var3); + flipShort(&ovlData->arrayObject[i]._numStates); - ovlData->arrayObject[i].var4 = *(int16 *) scriptPtr; + ovlData->arrayObject[i]._varTableIdx = *(int16 *) scriptPtr; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].var4); + flipShort(&ovlData->arrayObject[i]._varTableIdx); - ovlData->arrayObject[i].var5 = *(int16 *) scriptPtr; + ovlData->arrayObject[i]._firstStateIdx = *(int16 *) scriptPtr; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].var5); + flipShort(&ovlData->arrayObject[i]._firstStateIdx); - ovlData->arrayObject[i].stateTableIdx = *(int16 *) scriptPtr; + ovlData->arrayObject[i]._stateTableIdx = *(int16 *) scriptPtr; scriptPtr += 2; - flipShort(&ovlData->arrayObject[i].stateTableIdx); + flipShort(&ovlData->arrayObject[i]._stateTableIdx); } if (scriptNotLoadedBefore) { |