[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.130,1.131
Travis Howell
kirben at users.sourceforge.net
Wed Feb 18 21:28:03 CET 2004
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3811
Modified Files:
descumm6.cpp
Log Message:
Restrict HE opcodes to HE flag
Add another HE opcode
Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- descumm6.cpp 19 Feb 2004 05:05:46 -0000 1.130
+++ descumm6.cpp 19 Feb 2004 05:17:45 -0000 1.131
@@ -2047,11 +2047,10 @@
jump(output);
break;
case 0x74:
- if (HumongousFlag) {
+ if (HumongousFlag)
ext(output, "pp|startSound");
- break;
- }
- ext(output, "p|startSound");
+ else
+ ext(output, "p|startSound");
break;
case 0x75:
ext(output, "p|stopSound");
@@ -2516,13 +2515,22 @@
ext(output, "rp|isRoomScriptRunning");
break;
case 0xD9:
- ext(output, "p|closeFile");
+ if (HumongousFlag)
+ ext(output, "p|closeFile");
+ else
+ invalidop(NULL, code);
break;
case 0xDA:
- ext(output, "rsp|openFile");
+ if (HumongousFlag)
+ ext(output, "rsp|openFile");
+ else
+ invalidop(NULL, code);
break;
case 0xDB:
- ext(output, "rpp|readFile");
+ if (HumongousFlag)
+ ext(output, "rpp|readFile");
+ else
+ invalidop(NULL, code);
break;
case 0xDC:
if (HumongousFlag)
@@ -2535,7 +2543,10 @@
ext(output, "rp|findAllObjects");
break;
case 0xDE:
- ext(output, "s|deleteFile");
+ if (HumongousFlag)
+ ext(output, "s|deleteFile");
+ else
+ invalidop(NULL, code);
break;
case 0xDF:
if (HumongousFlag)
@@ -2555,20 +2566,41 @@
ext(output, "rp|unknownE1");
break;
case 0xE2:
- ext(output, "p|localizeArray");
+ if (HumongousFlag)
+ ext(output, "p|localizeArray");
+ else
+ invalidop(NULL, code);
break;
case 0xEC:
- ext(output, "rp|getActorLayer");
+ if (HumongousFlag)
+ invalidop(NULL, code);
+ else
+ ext(output, "rp|getActorLayer");
break;
case 0xED:
- ext(output, "rp|getObjectNewDir");
+ if (HumongousFlag)
+ invalidop(NULL, code);
+ else
+ ext(output, "rp|getObjectNewDir");
+ break;
+ case 0xE9:
+ if (HumongousFlag)
+ ext(output, "ppp|seekFile");
+ else
+ invalidop(NULL, code);
break;
case 0xF3:
- ext(output, "rsp|readINI");
+ if (HumongousFlag)
+ ext(output, "rsp|readINI");
+ else
+ invalidop(NULL, code);
break;
case 0xFA:
- get_byte();
- ext(output, "s|unknownFA");
+ if (HumongousFlag) {
+ get_byte();
+ ext(output, "s|unknownFA");
+ } else
+ invalidop(NULL, code);
break;
default:
invalidop(NULL, code);
More information about the Scummvm-git-logs
mailing list