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

renamed HE opcodes to distinguish them from their 'regular' V6/V7 counterparts

Browse source 
svn-id: r15173
This commit is contained in:
Max Horn 2004-09-18 22:09:34 +00:00
parent 81191ea60b
commit 7b70210286
6 changed files with 220 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

46
scumm/script_v72he.cpp
View file

@ -178,19 +178,19 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_cutscene),
OPCODE(o6_stopMusic),
OPCODE(o6_freezeUnfreeze),
OPCODE(o7_cursorCommand),
OPCODE(o70he_cursorCommand),
/* 6C */
OPCODE(o6_breakHere),
OPCODE(o6_ifClassOfIs),
OPCODE(o6_setClass),
OPCODE(o6_getState),
/* 70 */
OPCODE(o6_setState),
OPCODE(o6he_setState),
OPCODE(o6_setOwner),
OPCODE(o6_getOwner),
OPCODE(o6_jump),
/* 74 */
OPCODE(o7_startSound),
OPCODE(o70he_startSound),
OPCODE(o6_stopSound),
OPCODE(o6_startMusic),
OPCODE(o6_stopObjectScript),
@ -210,7 +210,7 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
OPCODE(o7_pickupObject),
OPCODE(o70he_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),
@ -220,7 +220,7 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_getActorMoving),
OPCODE(o6_isScriptRunning),
/* 8C */
OPCODE(o7_getActorRoom),
OPCODE(o70he_getActorRoom),
OPCODE(o6_getObjectX),
OPCODE(o6_getObjectY),
OPCODE(o6_getObjectOldDir),
@ -238,9 +238,9 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_isSoundRunning),
OPCODE(o6_setBoxFlags),
OPCODE(o6_invalid),
OPCODE(o7_resourceRoutines),
OPCODE(o70he_resourceRoutines),
/* 9C */
OPCODE(o6_roomOps),
OPCODE(o6he_roomOps),
OPCODE(o72_actorOps),
OPCODE(o72_verbOps),
OPCODE(o6_getActorFromXY),
@ -256,13 +256,13 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_pop),
/* A8 */
OPCODE(o6_getActorWidth),
OPCODE(o6_wait),
OPCODE(o6he_wait),
OPCODE(o6_getActorScaleX),
OPCODE(o6_getActorAnimCounter1),
/* AC */
OPCODE(o6_invalid),
OPCODE(o6_isAnyOf),
OPCODE(o7_quitPauseRestart),
OPCODE(o70he_quitPauseRestart),
OPCODE(o6_isActorInBox),
/* B0 */
OPCODE(o6_delay),
@ -295,8 +295,8 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_distObjectPt),
OPCODE(o6_distPtPt),
/* C8 */
OPCODE(o6_kernelGetFunctions),
OPCODE(o7_kernelSetFunctions),
OPCODE(o6he_kernelGetFunctions),
OPCODE(o70he_kernelSetFunctions),
OPCODE(o6_delayFrames),
OPCODE(o6_pickOneOf),
/* CC */
@ -316,18 +316,18 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_bor),
/* D8 */
OPCODE(o6_isRoomScriptRunning),
OPCODE(o6_closeFile),
OPCODE(o6he_closeFile),
OPCODE(o72_openFile),
OPCODE(o72_readFile),
/* DC */
OPCODE(o72_writeFile),
OPCODE(o72_findAllObjects),
OPCODE(o72_deleteFile),
OPCODE(o6_rename),
OPCODE(o6he_rename),
/* E0 */
OPCODE(o6_soundOps),
OPCODE(o6he_soundOps),
OPCODE(o72_getPixel),
OPCODE(o6_localizeArray),
OPCODE(o6he_localizeArray),
OPCODE(o72_pickVarRandom),
/* E4 */
OPCODE(o6_setBoxSet),
@ -336,13 +336,13 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o6_invalid),
/* E8 */
OPCODE(o6_invalid),
OPCODE(o6_seekFilePos),
OPCODE(o6he_seekFilePos),
OPCODE(o72_redimArray),
OPCODE(o6_readFilePos),
OPCODE(o6he_readFilePos),
/* EC */
OPCODE(o72_unknownEC),
OPCODE(o72_unknownED),
OPCODE(o7_stringLen),
OPCODE(o70he_stringLen),
OPCODE(o72_unknownEF),
/* F0 */
OPCODE(o72_unknownF0),
@ -358,9 +358,9 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o72_unknownF8),
OPCODE(o72_setFilePath),
OPCODE(o72_unknownFA),
OPCODE(o7_polygonOps),
OPCODE(o70he_polygonOps),
/* FC */
OPCODE(o7_polygonHit),
OPCODE(o70he_polygonHit),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
@ -899,7 +899,7 @@ void ScummEngine_v72he::o72_actorOps() {
return;
}
a = derefActorSafe(_curActor, "o6_actorOps");
a = derefActorSafe(_curActor, "o6he_actorOps");
if (!a)
return;
@ -1559,7 +1559,7 @@ void ScummEngine_v72he::o72_openFile() {
else if (mode == 2)
_hFileTable[slot].open((char*)filename + r, File::kFileWriteMode);
else
error("o6_openFile(): wrong open file mode %d", mode);
error("o6he_openFile(): wrong open file mode %d", mode);
if (_hFileTable[slot].isOpen() == false)
slot = -1;
@ -1899,7 +1899,7 @@ void ScummEngine_v72he::o72_unknownF1() {
}
push (1);
debug(1,"o7_unknownF1 stub (%d, %d)", id, id2);
debug(1,"o70he_unknownF1 stub (%d, %d)", id, id2);
}
void ScummEngine_v72he::o72_checkGlobQueue() {