[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.154,1.155
Jonathan Gray
khalek at users.sourceforge.net
Fri Jun 6 17:09:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.37,1.38
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.125,1.126 boxes.cpp,1.35,1.36 camera.cpp,2.4,2.5 charset.cpp,2.41,2.42 costume.cpp,1.57,1.58 dialogs.cpp,1.51,1.52 gfx.cpp,2.151,2.152 object.cpp,1.118,1.119 player_v2.cpp,2.12,2.13 resource.cpp,1.95,1.96 resource_v2.cpp,1.21,1.22 saveload.cpp,1.87,1.88 script.cpp,1.109,1.110 script_v2.cpp,2.134,2.135 script_v5.cpp,1.112,1.113 script_v6.cpp,1.155,1.156 scummvm.cpp,2.222,2.223 sound.cpp,1.131,1.132 string.cpp,1.132,1.133 verbs.cpp,1.52,1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17020
Modified Files:
script_v6.cpp
Log Message:
compilation fix
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- script_v6.cpp 5 Jun 2003 07:17:57 -0000 1.154
+++ script_v6.cpp 7 Jun 2003 00:08:47 -0000 1.155
@@ -378,7 +378,7 @@
int Scumm_v6::popRoomAndObj(int *room) {
int obj;
- if (_features & GF_HAS_ROOMTABLE) {
+ if (_features & GF_AFTER_V7) {
obj = pop();
*room = getObjectRoom(obj);
} else {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.37,1.38
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.125,1.126 boxes.cpp,1.35,1.36 camera.cpp,2.4,2.5 charset.cpp,2.41,2.42 costume.cpp,1.57,1.58 dialogs.cpp,1.51,1.52 gfx.cpp,2.151,2.152 object.cpp,1.118,1.119 player_v2.cpp,2.12,2.13 resource.cpp,1.95,1.96 resource_v2.cpp,1.21,1.22 saveload.cpp,1.87,1.88 script.cpp,1.109,1.110 script_v2.cpp,2.134,2.135 script_v5.cpp,1.112,1.113 script_v6.cpp,1.155,1.156 scummvm.cpp,2.222,2.223 sound.cpp,1.131,1.132 string.cpp,1.132,1.133 verbs.cpp,1.52,1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list