diff options
Diffstat (limited to 'engines/cine/script.cpp')
-rw-r--r-- | engines/cine/script.cpp | 297 |
1 files changed, 94 insertions, 203 deletions
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp index e19da540eb..c4f1575462 100644 --- a/engines/cine/script.cpp +++ b/engines/cine/script.cpp @@ -660,9 +660,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { paramIdx = *(currentScriptPtr + currentPosition); currentPosition++; - newValue = *(int16 *)(currentScriptPtr + currentPosition); + newValue = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)&newValue); DEBUG_SCRIPT(currentLine, "modifyObjectParam(objIdx:%d,paramIdx:%d,newValue:%d)", objIdx, paramIdx, newValue); @@ -703,9 +702,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { paramIdx = *(currentScriptPtr + currentPosition); currentPosition++; - newValue = *(int16 *)(currentScriptPtr + currentPosition); + newValue = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)&newValue); DEBUG_SCRIPT(currentLine, "addObjectParam(objIdx:%d,paramIdx:%d,newValue:%d)", objIdx, paramIdx, newValue); @@ -725,9 +723,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { paramIdx = *(currentScriptPtr + currentPosition); currentPosition++; - newValue = *(int16 *)(currentScriptPtr + currentPosition); + newValue = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)&newValue); DEBUG_SCRIPT(currentLine, "subObjectParam(objIdx:%d,paramIdx:%d,newValue:%d)", objIdx, paramIdx, newValue); @@ -747,9 +744,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { param1 = *(currentScriptPtr + currentPosition); currentPosition++; - param2 = *(int16 *) (currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); DEBUG_SCRIPT(currentLine, "compareObjectParam(objIdx:%d,type:%d,value:%d)", objIdx, param1, param2); @@ -768,21 +764,17 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { objIdx = *(currentScriptPtr + currentPosition); currentPosition++; - param1 = *(int16 *)(currentScriptPtr + currentPosition); + param1 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m1); - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); - param3 = *(int16 *)(currentScriptPtr + currentPosition); + param3 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m3); - param4 = *(int16 *)(currentScriptPtr + currentPosition); + param4 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m4); DEBUG_SCRIPT(currentLine, "setupObject(objIdx:%d,%d,%d,%d,%d)", objIdx, param1, param2, param3, param4); @@ -801,21 +793,17 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { objIdx = *(currentScriptPtr + currentPosition); currentPosition++; - param1 = *(int16 *)(currentScriptPtr + currentPosition); + param1 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m1); - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); - param3 = *(int16 *) (currentScriptPtr + currentPosition); + param3 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m3); - param4 = *(int16 *) (currentScriptPtr + currentPosition); + param4 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m4); DEBUG_SCRIPT(currentLine, "checkCollision(objIdx:%d,%d,%d,%d,%d)", objIdx, param1, param2, param3, param4); @@ -880,13 +868,13 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { case 8: { DEBUG_SCRIPT(currentLine, "var[%d] = file[%d].packedSize", varIdx, dataIdx); - scriptElement->localVars[varIdx] = partBuffer[dataIdx].packed_size; + scriptElement->localVars[varIdx] = partBuffer[dataIdx].packedSize; break; } case 9: { DEBUG_SCRIPT(currentLine, "var[%d] = file[%d].unpackedSize", varIdx, dataIdx); - scriptElement->localVars[varIdx] = partBuffer[dataIdx].unpacked_size; + scriptElement->localVars[varIdx] = partBuffer[dataIdx].unpackedSize; break; } default: @@ -897,9 +885,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { int16 newData; - newData = *(int16 *)(currentScriptPtr + currentPosition); + newData = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)&newData); DEBUG_SCRIPT(currentLine, "var[%d] = %d", varIdx, newData); @@ -930,9 +917,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { int16 param2; - param2 = *(int16 *) (currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); DEBUG_SCRIPT(currentLine, "var[%d] += %d", param1, param2); @@ -964,9 +950,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { int16 param2; - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); DEBUG_SCRIPT(currentLine, "var[%d] -= %d", param1, param2); @@ -998,9 +983,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { int16 param2; - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); DEBUG_SCRIPT(currentLine, "var[%d] *= %d", param1, param2); @@ -1032,9 +1016,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { int16 param2; - param2 = *(int16 *) (currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)¶m2); DEBUG_SCRIPT(currentLine, "var[%d] /= %d", param1, param2); @@ -1079,9 +1062,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { int16 value; - value = *(int16 *) (currentScriptPtr + currentPosition); + value = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)&value); DEBUG_SCRIPT(currentLine, "compare var[%d] and %d", varIdx, value); @@ -1529,17 +1511,14 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { numColor = *(currentScriptPtr + currentPosition); currentPosition++; - r = *(int16 *)(currentScriptPtr + currentPosition); + r = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&r); - g = *(int16 *)(currentScriptPtr + currentPosition); + g = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&g); - b = *(int16 *)(currentScriptPtr + currentPosition); + b = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&b); DEBUG_SCRIPT(currentLine, "transformPaletteRange(from:%d,numIdx:%d,r:%d,g:%d,b:%d) -> unimplemented", startColor, numColor, r, g, b); @@ -1609,21 +1588,17 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { param1 = *(currentScriptPtr + currentPosition); currentPosition++; - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m2); - param3 = *(int16 *)(currentScriptPtr + currentPosition); + param3 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m3); - param4 = *(int16 *)(currentScriptPtr + currentPosition); + param4 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m4); - param5 = *(int16 *)(currentScriptPtr + currentPosition); + param5 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m5); DEBUG_SCRIPT(currentLine, "message(%d,%d,%d,%d,%d)", param1, param2, param3, param4, param5); @@ -1660,9 +1635,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { uint16 newData; - newData = *(int16 *)(currentScriptPtr + currentPosition); + newData = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&newData); DEBUG_SCRIPT(currentLine, "globalVars[%d] = %d", idx, newData); @@ -1694,9 +1668,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { uint16 newData; - newData = *(int16 *)(currentScriptPtr + currentPosition); + newData = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&newData); DEBUG_SCRIPT(currentLine, "compare globalVars[%d] and %d", @@ -1765,9 +1738,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { zoneIdx = *(currentScriptPtr + currentPosition); currentPosition++; - var = *(int16 *)(currentScriptPtr + currentPosition); + var = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&var); DEBUG_SCRIPT(currentLine, "setZone[%d] = %d", zoneIdx, var); @@ -1857,13 +1829,11 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { currentPosition++; - volume = *(int16 *) (currentScriptPtr + currentPosition); + volume = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16((uint16 *)&volume); - flag = *(uint16 *)(currentScriptPtr + currentPosition); + flag = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(&flag); if (volume > 63) volume = 63; @@ -1941,19 +1911,15 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { param4 = *(currentScriptPtr + currentPosition); currentPosition++; - param5 = *(int16 *)(currentScriptPtr + currentPosition); + param5 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - param6 = *(int16 *)(currentScriptPtr + currentPosition); + param6 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - param7 = *(int16 *)(currentScriptPtr + currentPosition); + param7 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m5); - flipU16(¶m6); - flipU16(¶m7); - DEBUG_SCRIPT(currentLine, "addUnkListElement(%d,%d,%d,%d,%d)", param1, param2, param3, param4, param5, param6, param7); addUnkListElement(param1, 0, param2, param3, param4, param5, param6, 0, param7); @@ -2009,7 +1975,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { DEBUG_SCRIPT(currentLine, "if(>) goto nearest %d (true)", labelIdx); ASSERT(scriptElement->stack[labelIdx] != -1); currentPosition = computeScriptStackFromScript(scriptElement->scriptPtr, currentPosition, labelIdx, - scriptTable[scriptElement->scriptIdx].var4); + scriptTable[scriptElement->scriptIdx].size); } else { DEBUG_SCRIPT(currentLine, "if(>) goto nearest %d (false)", labelIdx); } @@ -2027,7 +1993,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { DEBUG_SCRIPT(currentLine, "if(>=) goto nearest %d (true)", labelIdx); ASSERT(scriptElement->stack[labelIdx] != -1); currentPosition = computeScriptStackFromScript(scriptElement->scriptPtr, currentPosition, labelIdx, - scriptTable[scriptElement->scriptIdx].var4); + scriptTable[scriptElement->scriptIdx].size); } else { DEBUG_SCRIPT(currentLine, "if(>=) goto nearest %d (false)", labelIdx); } @@ -2045,7 +2011,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { DEBUG_SCRIPT(currentLine, "if(<) goto nearest %d (true)", labelIdx); ASSERT(scriptElement->stack[labelIdx] != -1); currentPosition = computeScriptStackFromScript(scriptElement->scriptPtr, - currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].var4); + currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].size); } else { DEBUG_SCRIPT(currentLine, "if(<) goto nearest %d (false)", labelIdx); } @@ -2063,7 +2029,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { DEBUG_SCRIPT(currentLine, "if(<=) goto nearest %d (true)", labelIdx); ASSERT(scriptElement->stack[labelIdx] != -1); currentPosition = computeScriptStackFromScript(scriptElement->scriptPtr, - currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].var4); + currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].size); } else { DEBUG_SCRIPT(currentLine, "if(<=) goto nearest %d (false)", labelIdx); } @@ -2081,7 +2047,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { DEBUG_SCRIPT(currentLine, "if(==) goto nearest %d (true)", labelIdx); ASSERT(scriptElement->stack[labelIdx] != -1); currentPosition = computeScriptStackFromScript(scriptElement->scriptPtr, - currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].var4); + currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].size); } else { DEBUG_SCRIPT(currentLine, "if(==) goto nearest %d (false)", labelIdx); } @@ -2099,7 +2065,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { DEBUG_SCRIPT(currentLine, "if(!=) goto nearest %d (true)", labelIdx); ASSERT(scriptElement->stack[labelIdx] != -1); currentPosition = computeScriptStackFromScript(scriptElement->scriptPtr, - currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].var4); + currentPosition, labelIdx, scriptTable[scriptElement->scriptIdx].size); } else { DEBUG_SCRIPT(currentLine, "if(!=) goto nearest %d (false)", labelIdx); } @@ -2226,9 +2192,8 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { } else { uint16 param2; - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m2); DEBUG_SCRIPT(currentLine, "additionalBgVScroll = %d", param2); @@ -2242,13 +2207,11 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) { uint16 param1; uint16 param2; - param1 = *(int16 *)(currentScriptPtr + currentPosition); + param1 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m1); - param2 = *(int16 *)(currentScriptPtr + currentPosition); + param2 = READ_BE_UINT16(currentScriptPtr + currentPosition); currentPosition += 2; - flipU16(¶m2); DEBUG_SCRIPT(currentLine, "addGfxElementA0(%d,%d)", param1, param2); @@ -2400,11 +2363,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *) (localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "obj[%d]%s = %d\n", param1, getObjPramName(param2), param3); break; @@ -2439,11 +2400,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "obj[%d]%s+=%d\n", param1, getObjPramName(param2), param3); break; @@ -2460,11 +2419,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *) (localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "obj[%d]%s-=%d\n", param1, getObjPramName(param2), param3); break; @@ -2481,11 +2438,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "obj[%d]%s+=obj[%d]%s\n", param1, getObjPramName(param2), param3, getObjPramName(param2)); break; @@ -2502,11 +2457,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "obj[%d]%s-=obj[%d]%s\n", param1, getObjPramName(param2), param3, getObjPramName(param2)); break; @@ -2523,11 +2476,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(compareString1, "obj[%d]%s", param1, getObjPramName(param2)); sprintf(compareString2, "%d", param3); @@ -2544,23 +2495,18 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param1 = *(localScriptPtr + position); position++; - param2 = *(int16 *)(localScriptPtr + position); + param2 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param4 = *(int16 *)(localScriptPtr + position); + param4 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m2); - flipU16(¶m3); - flipU16(¶m4); - flipU16(¶m5); - sprintf(lineBuffer, "setupObject(Idx:%d,X:%d,Y:%d,mask:%d,frame:%d)\n", param1, param2, param3, param4, param5); break; @@ -2576,23 +2522,18 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param1 = *(localScriptPtr + position); position++; - param2 = *(int16 *)(localScriptPtr + position); + param2 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param4 = *(int16 *)(localScriptPtr + position); + param4 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m2); - flipU16(¶m3); - flipU16(¶m4); - flipU16(¶m5); - sprintf(lineBuffer, "checkCollision(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5); break; @@ -2630,11 +2571,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *) (localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "var[%d]=%d\n", param1, param3); } @@ -2661,11 +2600,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *) (localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "var[%d]+=%d\n", param1, param3); } break; @@ -2691,11 +2628,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "var[%d]-=%d\n", param1, param3); } break; @@ -2721,11 +2656,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *) (localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "var[%d]*=%d\n", param1, param3); } break; @@ -2751,11 +2684,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *) (localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "var[%d]/=%d\n", param1, param3); } break; @@ -2790,11 +2721,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(compareString1, "var[%d]", param1); sprintf(compareString2, "%d", param3); } @@ -3121,19 +3050,15 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param4 = *(int16 *)(localScriptPtr + position); + param4 = READ_BE_UINT16)(localScriptPtr + position); position += 2; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - flipU16(¶m4); - flipU16(¶m5); - sprintf(lineBuffer, "transformPaletteRange(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5); break; @@ -3171,23 +3096,18 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param1 = *(localScriptPtr + position); position++; - param2 = *(int16 *)(localScriptPtr + position); + param2 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param4 = *(int16 *)(localScriptPtr + position); + param4 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m2); - flipU16(¶m3); - flipU16(¶m4); - flipU16(¶m5); - sprintf(lineBuffer, "message(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5); break; @@ -3219,11 +3139,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(lineBuffer, "globalVar[%d] = %d\n", param1, param3); } break; @@ -3257,11 +3175,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param3; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - sprintf(compareString1, "globalVar[%d]", param1); sprintf(compareString2, "%d", param3); } @@ -3307,11 +3223,9 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param1 = *(localScriptPtr + position); position++; - param2 = *(int16 *) (localScriptPtr + position); + param2 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m2); - sprintf(lineBuffer, "tableUnk1[%d] = %d\n", param1, param2); break; @@ -3396,22 +3310,18 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; param4 = *(localScriptPtr + position); position++; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param6 = *(int16 *)(localScriptPtr + position); + param6 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - flipU16(¶m5); - flipU16(¶m6); - sprintf(lineBuffer, "playSample(%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6); break; @@ -3431,22 +3341,18 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; param4 = *(localScriptPtr + position); position++; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param6 = *(int16 *)(localScriptPtr + position); + param6 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - flipU16(¶m5); - flipU16(¶m6); - sprintf(lineBuffer, "OP_78(%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6); break; @@ -3495,19 +3401,15 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param4 = *(localScriptPtr + position); position++; - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param6 = *(int16 *)(localScriptPtr + position); + param6 = READ_BE_UINT16(localScriptPtr + position); position += 2; - param7 = *(int16 *)(localScriptPtr + position); + param7 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m5); - flipU16(¶m6); - flipU16(¶m7); - sprintf(lineBuffer, "OP_7F(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6, param7); break; @@ -3541,13 +3443,11 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 param2 = *(localScriptPtr + position); position++; - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - param4 = *(int16 *)(localScriptPtr + position); + param4 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m4); param5 = *(localScriptPtr + position); position++; @@ -3615,37 +3515,29 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 int16 param7; int16 param8; - param1 = *(int16 *)(localScriptPtr + position); + param1 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m1); - param2 = *(int16 *)(localScriptPtr + position); + param2 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m2); - param3 = *(int16 *)(localScriptPtr + position); + param3 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m3); - param4 = *(int16 *)(localScriptPtr + position); + param4 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m4); - param5 = *(int16 *)(localScriptPtr + position); + param5 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m5); - param6 = *(int16 *)(localScriptPtr + position); + param6 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m6); - param7 = *(int16 *)(localScriptPtr + position); + param7 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m7); - param8 = *(int16 *)(localScriptPtr + position); + param8 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m8); sprintf(compareString1, "obj[%d]", param1); sprintf(compareString2, "{%d,%d,%d,%d,%d,%d,%d}", param2, param3, param4, param5, param6, param7, param8); @@ -3728,9 +3620,8 @@ void decompileScript(uint8 *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint1 } else { int16 param2; - param2 = *(int16 *)(localScriptPtr + position); + param2 = READ_BE_UINT16(localScriptPtr + position); position += 2; - flipU16(¶m2); sprintf(lineBuffer, "OP_9E(%d,%d)\n", param, param2); } |