[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.35,1.36
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 22 18:39:03 CET 2002
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv2349
Modified Files:
descumm6.cpp
Log Message:
fixed jumps
Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- descumm6.cpp 23 Dec 2002 02:23:55 -0000 1.35
+++ descumm6.cpp 23 Dec 2002 02:38:44 -0000 1.36
@@ -495,24 +495,24 @@
NULL,
NULL,
NULL,
- /* XXX */
- NULL,
- NULL,
- NULL,
- NULL,
- /* XXX */
+ /* 52 */
NULL,
NULL,
NULL,
NULL,
- /* XXX */
+ /* 56 */
+ "sentence_script",
+ "pickup_script",
+ "cutscene_script",
+ "endcutscene_script",
+ /* 60 */
NULL,
NULL,
NULL,
NULL,
/* 64 */
- NULL,
- NULL,
+ "pause_key?",
+ "saveload_key?",
NULL,
NULL,
/* XXX */
@@ -585,14 +585,14 @@
NULL,
NULL,
NULL,
- /* XXX */
- NULL,
+ /* 124 */
NULL,
NULL,
+ "default_actor",
NULL,
/* 128 */
NULL,
- NULL,
+ "text_delay?",
"sputm_debug",
NULL,
};
@@ -1192,7 +1192,7 @@
void jump()
{
- int cur = get_curoffs() + 2;
+ int cur = get_curoffs() + ((scriptVersion == 8) ? 4 : 2);
int to = cur + get_signed_word();
if (!dontOutputElse && maybeAddElse(cur, to)) {
@@ -1208,7 +1208,7 @@
void jumpif(StackEnt * se, bool when)
{
- int cur = get_curoffs() + 2;
+ int cur = get_curoffs() + ((scriptVersion == 8) ? 4 : 2);
int offset = get_signed_word();
int to = cur + offset;
char *e = output;
@@ -1388,6 +1388,29 @@
);
break;
+ case 0xAA:
+ ext("x" "resourceRoutines\0"
+ "\x3Cp|loadCharset,"
+ "\x3Dp|loadCostume,"
+ "\x3Ep|loadObject,"
+ "\x3Fp|loadRoom,"
+ "\x40p|loadScript,"
+ "\x41p|loadSound,"
+ "\x42p|lockCostume,"
+ "\x43p|lockRoom,"
+ "\x44p|lockScript,"
+ "\x45p|lockSound,"
+ "\x46p|unlockCostume,"
+ "\x47p|unlockRoom,"
+ "\x48p|unlockScript,"
+ "\x49p|unlockSound,"
+ "\x4Ap|nukeCostume,"
+ "\x4Bp|nukeRoom,"
+ "\x4Cp|nukeScript,"
+ "\x4Dp|nukeSound"
+ );
+ break;
+
case 0xB3:
ext("x" "system\0" "\x28|restart," "\x29|quit");
break;
@@ -1719,11 +1742,26 @@
ext("|createBoxMatrix");
break;
case 0x9B:
- ext("x" "resourceRoutines\0" "\x64p|loadScript," "\x65p|loadSound," "\x66p|loadCostume,"
- "\x67p|loadRoom," "\x68p|nukeScript," "\x69p|nukeSound," "\x6Ap|nukeCostume,"
- "\x6Bp|nukeRoom," "\x6Cp|lockScript," "\x6Dp|lockSound," "\x6Ep|lockCostume,"
- "\x6Fp|lockRoom," "\x70p|unlockScript," "\x71p|unlockSound," "\x72p|unlockCostume,"
- "\x73p|unlockRoom," "\x75p|loadCharset," "\x76p|nukeCharset," "\x77z|loadFlObject");
+ ext("x" "resourceRoutines\0"
+ "\x64p|loadScript,"
+ "\x65p|loadSound,"
+ "\x66p|loadCostume,"
+ "\x67p|loadRoom,"
+ "\x68p|nukeScript,"
+ "\x69p|nukeSound,"
+ "\x6Ap|nukeCostume,"
+ "\x6Bp|nukeRoom,"
+ "\x6Cp|lockScript,"
+ "\x6Dp|lockSound,"
+ "\x6Ep|lockCostume,"
+ "\x6Fp|lockRoom,"
+ "\x70p|unlockScript,"
+ "\x71p|unlockSound,"
+ "\x72p|unlockCostume,"
+ "\x73p|unlockRoom,"
+ "\x75p|loadCharset,"
+ "\x76p|nukeCharset,"
+ "\x77z|loadFlObject");
break;
case 0x9C:
ext("x" "roomOps\0"
More information about the Scummvm-git-logs
mailing list