[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.384,2.385 script_v100he.cpp,2.79,2.80
kirben
kirben at users.sourceforge.net
Mon Mar 7 20:18:33 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.78,2.79 script_v72he.cpp,2.214,2.215 script_v7he.cpp,2.131,2.132 script_v90he.cpp,2.177,2.178 sound.cpp,1.424,1.425
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.h,1.77,1.78 intern.h,2.385,2.386 script_v100he.cpp,2.80,2.81 script_v90he.cpp,2.178,2.179
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29834/scumm
Modified Files:
intern.h script_v100he.cpp
Log Message:
Script flags are different in HE100
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.384
retrieving revision 2.385
diff -u -d -r2.384 -r2.385
--- intern.h 7 Mar 2005 10:21:22 -0000 2.384
+++ intern.h 8 Mar 2005 04:17:40 -0000 2.385
@@ -1079,6 +1079,7 @@
void o100_setSpriteGroupInfo();
void o100_resourceRoutines();
void o100_wizImageOps();
+ void o100_jumpToScript();
void o100_loadSBNG();
void o100_dim2dim2Array();
void o100_paletteOps();
@@ -1086,6 +1087,7 @@
void o100_roomOps();
void o100_startSound();
void o100_setSpriteInfo();
+ void o100_startScript();
void o100_quitPauseRestart();
void o100_cursorCommand();
void o100_wait();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.79
retrieving revision 2.80
diff -u -d -r2.79 -r2.80
--- script_v100he.cpp 8 Mar 2005 03:52:02 -0000 2.79
+++ script_v100he.cpp 8 Mar 2005 04:17:45 -0000 2.80
@@ -62,7 +62,7 @@
OPCODE(o6_panCameraTo),
/* 10 */
OPCODE(o6_invalid),
- OPCODE(o72_jumpToScript),
+ OPCODE(o100_jumpToScript),
OPCODE(o6_setClass),
OPCODE(o60_closeFile),
/* 14 */
@@ -196,7 +196,7 @@
OPCODE(o6_stampObject),
OPCODE(o72_startObject),
/* 7C */
- OPCODE(o72_startScript),
+ OPCODE(o100_startScript),
OPCODE(o6_startScriptQuick),
OPCODE(o80_setState),
OPCODE(o6_stopObjectScript),
@@ -715,6 +715,18 @@
}
}
+void ScummEngine_v100he::o100_jumpToScript() {
+ int args[25];
+ int script;
+ byte flags;
+
+ getStackList(args, ARRAYSIZE(args));
+ script = pop();
+ flags = fetchScriptByte();
+ stopObjectCode();
+ runScript(script, (flags == 128 || flags == 129), (flags == 130 || flags == 129), args);
+}
+
void ScummEngine_v100he::o100_loadSBNG() {
// Loads SBNG sound resource
byte subOp = fetchScriptByte();
@@ -1971,6 +1983,17 @@
}
}
+void ScummEngine_v100he::o100_startScript() {
+ int args[25];
+ int script;
+ byte flags;
+
+ getStackList(args, ARRAYSIZE(args));
+ script = pop();
+ flags = fetchScriptByte();
+ runScript(script, (flags == 128 || flags == 129), (flags == 130 || flags == 129), args);
+}
+
void ScummEngine_v100he::o100_quitPauseRestart() {
byte subOp = fetchScriptByte();
subOp -= 61;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.78,2.79 script_v72he.cpp,2.214,2.215 script_v7he.cpp,2.131,2.132 script_v90he.cpp,2.177,2.178 sound.cpp,1.424,1.425
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.h,1.77,1.78 intern.h,2.385,2.386 script_v100he.cpp,2.80,2.81 script_v90he.cpp,2.178,2.179
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list