[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.199,1.200 scummvm.cpp,2.447,2.448
Travis Howell
kirben at users.sourceforge.net
Tue Oct 14 19:39:03 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common timer.cpp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.31,1.32 build_display.cpp,1.33,1.34 console.cpp,1.18,1.19 controls.cpp,1.31,1.32 function.cpp,1.25,1.26 icons.cpp,1.13,1.14 layers.cpp,1.12,1.13 logic.cpp,1.20,1.21 maketext.cpp,1.22,1.23 mem_view.cpp,1.16,1.17 mouse.cpp,1.26,1.27 resman.cpp,1.53,1.54 speech.cpp,1.30,1.31 startup.cpp,1.21,1.22 sword2.cpp,1.58,1.59 sword2.h,1.21,1.22 walker.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21715/scumm
Modified Files:
script_v5.cpp scummvm.cpp
Log Message:
Version 4 games should use older code style too, checked against loomcd/monkeyvga disasm.
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- script_v5.cpp 12 Oct 2003 17:17:43 -0000 1.199
+++ script_v5.cpp 15 Oct 2003 02:38:22 -0000 1.200
@@ -1482,9 +1482,7 @@
startScene(a->room, a, obj);
VAR(VAR_WALKTO_OBJ) = 0;
- if (_version <= 3) {
- // FIXME: Maybe this should also cover V4 games. See also startScene().
- // More investigation (ASM) needed.
+ if (_version <= 4) {
if (!_egoPositioned) {
getObjectXYPos(obj, x2, y2, dir);
a->putActor(x2, y2, _currentRoom);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.447
retrieving revision 2.448
diff -u -d -r2.447 -r2.448
--- scummvm.cpp 14 Oct 2003 10:24:27 -0000 2.447
+++ scummvm.cpp 15 Oct 2003 02:38:23 -0000 2.448
@@ -1975,9 +1975,7 @@
runEntryScript();
if (_version <= 2)
runScript(5, 0, 0, 0);
- else if (_version >= 4 && _version <= 6) {
- // FIXME: The check above maybe should only trigger for V5&V6 games (i.e. not
- // for V4). More investigation (ASM) needed. See also o5_loadRoomWithEgo().
+ else if (_version >= 5 && _version <= 6) {
if (a && !_egoPositioned) {
int x, y;
getObjectXYPos(objectNr, x, y);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common timer.cpp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.31,1.32 build_display.cpp,1.33,1.34 console.cpp,1.18,1.19 controls.cpp,1.31,1.32 function.cpp,1.25,1.26 icons.cpp,1.13,1.14 layers.cpp,1.12,1.13 logic.cpp,1.20,1.21 maketext.cpp,1.22,1.23 mem_view.cpp,1.16,1.17 mouse.cpp,1.26,1.27 resman.cpp,1.53,1.54 speech.cpp,1.30,1.31 startup.cpp,1.21,1.22 sword2.cpp,1.58,1.59 sword2.h,1.21,1.22 walker.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list