[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.338,1.339
Travis Howell
kirben at users.sourceforge.net
Wed Jun 23 02:49:07 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.214,1.215 script_v7he.cpp,2.18,2.19 scumm.h,1.406,1.407 sound.cpp,1.337,1.338
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.64,2.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21464/scumm
Modified Files:
script_v6.cpp
Log Message:
Fix room changing in HE7 games.
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- script_v6.cpp 23 Jun 2004 01:47:34 -0000 1.338
+++ script_v6.cpp 23 Jun 2004 09:48:27 -0000 1.339
@@ -1177,7 +1177,11 @@
int room, obj, x, y;
Actor *a;
- obj = popRoomAndObj(&room);
+ if (_features & GF_HUMONGOUS) {
+ room = pop();
+ obj = pop();
+ } else
+ obj = popRoomAndObj(&room);
a = derefActor(pop(), "o6_putActorAtObject");
if (whereIsObject(obj) != WIO_NOT_FOUND) {
@@ -1257,7 +1261,11 @@
y = pop();
x = pop();
- obj = popRoomAndObj(&room);
+ if (_features & GF_HUMONGOUS) {
+ room = pop();
+ obj = pop();
+ } else
+ obj = popRoomAndObj(&room);
a = derefActor(VAR(VAR_EGO), "o6_loadRoomWithEgo");
a->putActor(0, 0, room);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.214,1.215 script_v7he.cpp,2.18,2.19 scumm.h,1.406,1.407 sound.cpp,1.337,1.338
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.64,2.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list