[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.168,2.169 script_v6he.cpp,2.67,2.68 script_v7he.cpp,2.21,2.22
Travis Howell
kirben at users.sourceforge.net
Thu Jun 24 08:14:03 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3138/scumm
Modified Files:
intern.h script_v6he.cpp script_v7he.cpp
Log Message:
Add some more HE7 differences.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.168
retrieving revision 2.169
diff -u -d -r2.168 -r2.169
--- intern.h 23 Jun 2004 01:36:57 -0000 2.168
+++ intern.h 24 Jun 2004 15:13:00 -0000 2.169
@@ -635,6 +635,7 @@
void o7_unknownFA();
void o7_unknownFB();
void o7_quitPauseRestart();
+ void o7_getActorRoom();
void o7_pickupObject();
void o7_startSound();
};
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- script_v6he.cpp 24 Jun 2004 13:03:26 -0000 2.67
+++ script_v6he.cpp 24 Jun 2004 15:13:00 -0000 2.68
@@ -243,7 +243,7 @@
/* 98 */
OPCODE(o6_isSoundRunning),
OPCODE(o6_setBoxFlags),
- OPCODE(o6_createBoxMatrix),
+ OPCODE(o6_invalid),
OPCODE(o6_resourceRoutines),
/* 9C */
OPCODE(o6_roomOps),
@@ -492,7 +492,8 @@
c = pop();
b = pop();
a = pop();
- setupShadowPalette(a, b, c, d, e);
+ if (_heversion == 60)
+ setupShadowPalette(a, b, c, d, e);
break;
case 184: // SO_SAVE_STRING
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- script_v7he.cpp 23 Jun 2004 10:52:22 -0000 2.21
+++ script_v7he.cpp 24 Jun 2004 15:13:00 -0000 2.22
@@ -226,7 +226,7 @@
OPCODE(o6_getActorMoving),
OPCODE(o6_isScriptRunning),
/* 8C */
- OPCODE(o6_getActorRoom),
+ OPCODE(o7_getActorRoom),
OPCODE(o6_getObjectX),
OPCODE(o6_getObjectY),
OPCODE(o6_getObjectOldDir),
@@ -243,7 +243,7 @@
/* 98 */
OPCODE(o6_isSoundRunning),
OPCODE(o6_setBoxFlags),
- OPCODE(o6_createBoxMatrix),
+ OPCODE(o6_invalid),
OPCODE(o6_resourceRoutines),
/* 9C */
OPCODE(o6_roomOps),
@@ -645,6 +645,16 @@
}
+void ScummEngine_v7he::o7_getActorRoom() {
+ int act = pop();
+
+ if (act < _numActors) {
+ Actor *a = derefActor(act, "o7_getActorRoom");
+ push(a->room);
+ } else
+ push(getObjectRoom(act));
+}
+
void ScummEngine_v7he::o7_startSound() {
byte op;
op = fetchScriptByte();
More information about the Scummvm-git-logs
mailing list