[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.47,1.48
James Brown
ender at users.sourceforge.net
Sun Jan 12 02:34:03 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17927/scumm
Modified Files:
object.cpp
Log Message:
Remove the second biggest hack I've ever seen
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- object.cpp 12 Jan 2003 10:20:09 -0000 1.47
+++ object.cpp 12 Jan 2003 10:33:30 -0000 1.48
@@ -124,15 +124,6 @@
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))) {
- warning("FIXME MAJOR: Hacking load of FlObject %d\n", object);
- loadFlObject(object, 3);
- return getObjectIndex(object);
- }*/
return -1;
}
}
More information about the Scummvm-git-logs
mailing list