[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.23,2.24 script_v6.cpp,1.26,1.27
Max Horn
fingolfin at users.sourceforge.net
Thu Dec 26 15:25:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26668
Modified Files:
intern.h script_v6.cpp
Log Message:
group startScript/Object codes (no code change)
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- intern.h 26 Dec 2002 21:50:13 -0000 2.23
+++ intern.h 26 Dec 2002 23:24:27 -0000 2.24
@@ -257,7 +257,7 @@
void o6_jump();
void o6_startScriptEx();
void o6_startScript();
- void o6_startObject();
+ void o6_startObjectEx();
void o6_setObjectState();
void o6_setObjectXY();
void o6_stopObjectCode();
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- script_v6.cpp 26 Dec 2002 23:05:19 -0000 1.26
+++ script_v6.cpp 26 Dec 2002 23:24:27 -0000 1.27
@@ -163,7 +163,7 @@
OPCODE(o6_startScriptEx),
OPCODE(o6_startScript),
/* 60 */
- OPCODE(o6_startObject),
+ OPCODE(o6_startObjectEx),
OPCODE(o6_setObjectState),
OPCODE(o6_setObjectXY),
OPCODE(o6_drawBlastObject),
@@ -737,7 +737,7 @@
getStackList(args, sizeof(args) / sizeof(args[0]));
script = pop();
flags = pop();
- o6_stopObjectCode();
+ stopObjectCode();
runScript(script, flags & 1, flags & 2, args);
}
@@ -750,7 +750,16 @@
runScript(script, 0, 0, args);
}
-void Scumm_v6::o6_startObject()
+void Scumm_v6::o6_startScriptQuick()
+{
+ int args[16];
+ int script;
+ getStackList(args, sizeof(args) / sizeof(args[0]));
+ script = pop();
+ runScript(script, 0, 1, args);
+}
+
+void Scumm_v6::o6_startObjectEx()
{
int args[16];
int script, entryp;
@@ -762,6 +771,16 @@
runVerbCode(script, entryp, flags & 1, flags & 2, args);
}
+void Scumm_v6::o6_startObjectQuick()
+{
+ int args[16];
+ int script, entryp;
+ getStackList(args, sizeof(args) / sizeof(args[0]));
+ entryp = pop();
+ script = pop();
+ runVerbCode(script, entryp, 0, 1, args);
+}
+
void Scumm_v6::o6_setObjectState()
{
int a = pop();
@@ -2326,25 +2345,6 @@
void Scumm_v6::o6_dummy()
{
/* nothing */
-}
-
-void Scumm_v6::o6_startObjectQuick()
-{
- int args[16];
- int script, entryp;
- getStackList(args, sizeof(args) / sizeof(args[0]));
- entryp = pop();
- script = pop();
- runVerbCode(script, entryp, 0, 1, args);
-}
-
-void Scumm_v6::o6_startScriptQuick()
-{
- int args[16];
- int script;
- getStackList(args, sizeof(args) / sizeof(args[0]));
- script = pop();
- runScript(script, 0, 1, args);
}
void Scumm_v6::o6_dim2()
More information about the Scummvm-git-logs
mailing list