[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.41,1.42
James Brown
ender at users.sourceforge.net
Sat Jan 11 10:53:03 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16692/scumm
Modified Files:
object.cpp
Log Message:
This is the second biggest hack I've ever seen! FlObject 188/189 hack.
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- object.cpp 1 Jan 2003 11:25:04 -0000 1.41
+++ object.cpp 11 Jan 2003 18:52:19 -0000 1.42
@@ -121,6 +121,14 @@
if (_objs[i].obj_nr == object)
return i;
}
+
+ // FIXME: Major HACK. This is probably the worst biggest
+ // hack in the whole engine. It's that bad.
+ // (Workaround flobject 188/189 not loaded bug)
+ if (_gameId == GID_CMI && ((object == 188 || object == 189))) {
+ loadFlObject(object, 3);
+ return getObjectIndex(object);
+ }
return -1;
}
}
@@ -145,6 +153,7 @@
return WIO_FLOBJECT;
return WIO_ROOM;
}
+
return WIO_NOT_FOUND;
}
More information about the Scummvm-git-logs
mailing list