[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.143,1.144
James Brown
ender at users.sourceforge.net
Tue Aug 20 03:09:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.40,1.41 costume.cpp,1.45,1.46 resource.cpp,1.103,1.104 script_v1.cpp,1.142,1.143 sound.cpp,1.129,1.130
- Next message: [Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.210,1.211
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv4379
Modified Files:
script_v1.cpp
Log Message:
Re-add MI2 fixme
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- script_v1.cpp 20 Aug 2002 09:58:35 -0000 1.143
+++ script_v1.cpp 20 Aug 2002 10:08:48 -0000 1.144
@@ -1345,6 +1345,10 @@
o2 = getVarOrDirectWord(0x40);
r = getObjActToObjActDist(o1, o2);
+ /* FIXME: MI2 race workaround, see bug 597022 */
+ if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60)
+ r = 60;
+
setResult(r);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.40,1.41 costume.cpp,1.45,1.46 resource.cpp,1.103,1.104 script_v1.cpp,1.142,1.143 sound.cpp,1.129,1.130
- Next message: [Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.210,1.211
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list