[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.233,2.234 script_v72he.cpp,2.69,2.70 script_v7he.cpp,2.67,2.68 script_v80he.cpp,2.11,2.12 script_v90he.cpp,2.19,2.20
Travis Howell
kirben at users.sourceforge.net
Thu Sep 9 07:09:09 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.301,2.302
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.283,1.284 actor.h,1.62,1.63 saveload.cpp,1.169,1.170 saveload.h,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21073/scumm
Modified Files:
intern.h script_v72he.cpp script_v7he.cpp script_v80he.cpp
script_v90he.cpp
Log Message:
Change needed for HE 71 too.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.233
retrieving revision 2.234
diff -u -d -r2.233 -r2.234
--- intern.h 9 Sep 2004 10:44:17 -0000 2.233
+++ intern.h 9 Sep 2004 14:07:51 -0000 2.234
@@ -731,7 +731,6 @@
void o72_printWizImage();
void o72_getArrayDimSize();
void o72_getNumFreeArrays();
- void o72_pickupObject();
void o72_actorOps();
void o72_verbOps();
void o72_arrayOps();
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -d -r2.69 -r2.70
--- script_v72he.cpp 9 Sep 2004 10:36:10 -0000 2.69
+++ script_v72he.cpp 9 Sep 2004 14:07:51 -0000 2.70
@@ -210,7 +210,7 @@
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
- OPCODE(o72_pickupObject),
+ OPCODE(o7_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),
@@ -826,19 +826,6 @@
push (num);
}
-void ScummEngine_v72he::o72_pickupObject() {
- int obj, room;
-
- room = pop();
- obj = pop();
- if (room == 0)
- room = getObjectRoom(obj);
-
- addObjectToInventory(obj, room);
- putOwner(obj, VAR(VAR_EGO));
- runInventoryScript(obj);
-}
-
void ScummEngine_v72he::o72_actorOps() {
Actor *a;
int i, j, k;
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- script_v7he.cpp 9 Sep 2004 11:50:23 -0000 2.67
+++ script_v7he.cpp 9 Sep 2004 14:07:51 -0000 2.68
@@ -554,10 +554,12 @@
addObjectToInventory(obj, room);
putOwner(obj, VAR(VAR_EGO));
- putClass(obj, kObjectClassUntouchable, 1);
- putState(obj, 1);
- markObjectRectAsDirty(obj);
- clearDrawObjectQueue();
+ if (_heversion <= 70) {
+ putClass(obj, kObjectClassUntouchable, 1);
+ putState(obj, 1);
+ markObjectRectAsDirty(obj);
+ clearDrawObjectQueue();
+ }
runInventoryScript(obj); /* Difference */
}
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- script_v80he.cpp 9 Sep 2004 04:44:46 -0000 2.11
+++ script_v80he.cpp 9 Sep 2004 14:07:51 -0000 2.12
@@ -210,7 +210,7 @@
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
- OPCODE(o72_pickupObject),
+ OPCODE(o7_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- script_v90he.cpp 9 Sep 2004 04:44:46 -0000 2.19
+++ script_v90he.cpp 9 Sep 2004 14:07:51 -0000 2.20
@@ -210,7 +210,7 @@
OPCODE(o6_animateActor),
OPCODE(o6_doSentence),
/* 84 */
- OPCODE(o72_pickupObject),
+ OPCODE(o7_pickupObject),
OPCODE(o6_loadRoomWithEgo),
OPCODE(o6_invalid),
OPCODE(o6_getRandomNumber),
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.301,2.302
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.283,1.284 actor.h,1.62,1.63 saveload.cpp,1.169,1.170 saveload.h,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list