thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CRUISE: Start renaming opcodes in the Decompiler, some rework

Browse source
This commit is contained in:
Strangerke 2014-06-01 11:50:04 +02:00
parent 6b8348a6bd
commit 0b4beb59b6
1 changed files with 55 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

129
engines/cruise/decompiler.cpp
View file

@ -697,46 +697,39 @@ int decompSwapStack() {
int decompFunction() { int decompFunction() {
currentScriptOpcodeType = getByteFromDecompScriptReal(); currentScriptOpcodeType = getByteFromDecompScriptReal();
// addDecomp("OP_%X", currentScriptOpcodeType);
switch (currentScriptOpcodeType) { switch (currentScriptOpcodeType) {
case 0x1: { case 0x1:
pushDecomp("_setdoFade()"); pushDecomp("Op_FadeIn()");
break; break;
}
case 0x2: { case 0x2:
pushDecomp("_prepareFade()"); pushDecomp("Op_FadeOut()");
break; break;
}
case 0x3: { case 0x3:
sprintf(tempbuffer, "_loadBackground(%s,%s)", sprintf(tempbuffer, "Op_loadBackground(%s,%s)", popDecomp(), popDecomp());
popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x4: { case 0x4:
sprintf(tempbuffer, "_loadFullBundle(%s,%s)", sprintf(tempbuffer, "Op_LoadAbs(%s,%s)", popDecomp(), popDecomp());
popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x5: { case 0x5:
sprintf(tempbuffer, "_addCell(%s,%s,%s)", popDecomp(), sprintf(tempbuffer, "Op_AddCell(%s,%s,%s)", popDecomp(), popDecomp(), popDecomp());
popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x6: { case 0x6: {
unsigned long int numArg = atoi(popDecomp()); unsigned long int numArg = atoi(popDecomp());
char *ovlStr;
char *idxStr;
char functionName[100]; char functionName[100];
idxStr = popDecomp(); char *idxStr = popDecomp();
ovlStr = popDecomp(); char *ovlStr = popDecomp();
resolveVarName(ovlStr, 0x20, idxStr, functionName); resolveVarName(ovlStr, 0x20, idxStr, functionName);
sprintf(tempbuffer, "Op_AddProc(%s", functionName);
sprintf(tempbuffer, "_startASync(%s", functionName);
for (int i = 0; i < numArg; i++) { for (int i = 0; i < numArg; i++) {
strcatuint8(tempbuffer, ","); strcatuint8(tempbuffer, ",");
@ -747,74 +740,62 @@ int decompFunction() {
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
} }
case 0x7: { case 0x7: {
char *var1; char *var1 = popDecomp();
char *objIdxStr; char *objIdxStr = popDecomp();
char *ovlStr; char *ovlStr = popDecomp();
var1 = popDecomp(); sprintf(tempbuffer, "Op_InitializeState(ovl:%s,dataIdx:%s,%s)", ovlStr, objIdxStr, var1);
objIdxStr = popDecomp(); pushDecomp(tempbuffer);
ovlStr = popDecomp(); break;
}
sprintf(tempbuffer, case 0x8:
"_createObjectFromOvlData(ovl:%s,dataIdx:%s,%s)", sprintf(tempbuffer, "Op_RemoveCell(%s,%s,%s)", popDecomp(), popDecomp(), popDecomp());
ovlStr, objIdxStr, var1);
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x8: { case 0x9:
sprintf(tempbuffer, "_removeCell(%s,%s,%s)", pushDecomp("Op_FreeCell()");
popDecomp(), popDecomp(), popDecomp()); break;
case 0xA:
sprintf(tempbuffer, "Op_RemoveProc(ovl(%s),%s)", popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x9: { case 0xB:
pushDecomp("_freeobjectList()"); sprintf(tempbuffer, "Op_RemoveFrame(%s,%s)", popDecomp(), popDecomp());
break;
}
case 0xA: {
sprintf(tempbuffer, "_removeScript(ovl(%s),%s)",
popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0xB: { case 0xC:
sprintf(tempbuffer, "_resetFilesEntries(%s,%s)", sprintf(tempbuffer, "Op_LoadOverlay(%s)", popDecomp());
popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0xC: { case 0xD:
sprintf(tempbuffer, "_loadOverlay(%s)", popDecomp()); sprintf(tempbuffer, "Op_SetColor(%s,%s,%s,%s,%s)", popDecomp(), popDecomp(), popDecomp(), popDecomp(), popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0xD: { case 0xE:
sprintf(tempbuffer, "_palManipulation(%s,%s,%s,%s,%s)", sprintf(tempbuffer, "Op_PlayFX(%s,%s,%s,%s)", popDecomp(), popDecomp(), popDecomp(), popDecomp());
popDecomp(), popDecomp(), popDecomp(), popDecomp(),
popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0xE: { case 0x10:
sprintf(tempbuffer, "_playSample(%s,%s,%s,%s)", sprintf(tempbuffer, "Op_FreeOverlay(%s)", popDecomp());
popDecomp(), popDecomp(), popDecomp(),
popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x10: { case 0x11:
sprintf(tempbuffer, "_releaseScript2(%s)", sprintf(tempbuffer, "Op_FindOverlay(%s)", popDecomp());
popDecomp());
pushDecomp(tempbuffer); pushDecomp(tempbuffer);
break; break;
}
case 0x11: {
sprintf(tempbuffer, "_getOverlayIdx(%s)", popDecomp());
pushDecomp(tempbuffer);
break;
}
case 0x13: { case 0x13: {
sprintf(tempbuffer, sprintf(tempbuffer,
"_displayMessage(%s,\"%s\",%s,%s,%s,%s)", "_displayMessage(%s,\"%s\",%s,%s,%s,%s)",