thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

End of flObject rewrite. It works! It works! :P

Browse source 
svn-id: r6421
This commit is contained in:
James Brown 2003-01-12 10:20:09 +00:00
parent 65b161b98c
commit a4af93c22c
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scumm/object.cpp
View file

@ -128,11 +128,11 @@ int Scumm::getObjectIndex(int object)
// FIXME: Major HACK. This is probably the worst biggest // FIXME: Major HACK. This is probably the worst biggest
// hack in the whole engine. It's that bad. // hack in the whole engine. It's that bad.
// (Workaround flobject 188/189 not loaded bug) // (Workaround flobject 188/189 not loaded bug)
if (_gameId == GID_CMI && ((object == 188 || object == 189))) { /*if (_gameId == GID_CMI && ((object == 188 || object == 189))) {
warning("FIXME MAJOR: Hacking load of FlObject %d\n", object); warning("FIXME MAJOR: Hacking load of FlObject %d\n", object);
loadFlObject(object, 3); loadFlObject(object, 3);
return getObjectIndex(object); return getObjectIndex(object);
} }*/
return -1; return -1;
} }
} }
@ -446,8 +446,21 @@ void Scumm::loadRoomObjects()
// Clear out old room objects (FIXME: Locking/FlObjects stuff?) // Clear out old room objects (FIXME: Locking/FlObjects stuff?)
for (i = 0; i < _numLocalObjects; i++) { for (i = 0; i < _numLocalObjects; i++) {
_objs[i].obj_nr = 0; if (_objs[i].obj_nr < 1) // Optimise codepath
_objs[i].fl_object_index = 0; continue;
// Nuke all non-flObjects (flObjects are nuked in script.cpp)
if (!_objs[i].fl_object_index) {
_objs[i].obj_nr = 0;
_objs[i].fl_object_index = 0;
} else {
// Nuke all unlocked flObjects
if (!(res.flags[rtFlObject][_objs[i].fl_object_index] & RF_LOCK)) {
nukeResource(rtFlObject, _objs[i].fl_object_index);
_objs[i].obj_nr = 0;
_objs[i].fl_object_index = 0;
}
}
} }
if (_numObjectsInRoom == 0) if (_numObjectsInRoom == 0)
@ -518,7 +531,7 @@ void Scumm::loadRoomObjects()
// ENDERFIXME: Switch this one over to numLocals also // ENDERFIXME: Switch this one over to numLocals also
for (i = 1; i < _numLocalObjects; i++) { for (i = 1; i < _numLocalObjects; i++) {
if (_objs[i].obj_nr) if (_objs[i].obj_nr && !_objs[i].fl_object_index)
setupRoomObject(&_objs[i], room); setupRoomObject(&_objs[i], room);
} }
@ -583,7 +596,7 @@ void Scumm::loadRoomObjectsSmall()
// ENDERFIXME: Switch to numLocals // ENDERFIXME: Switch to numLocals
for (i = 1; i < _numLocalObjects; i++) { for (i = 1; i < _numLocalObjects; i++) {
if (_objs[i].obj_nr) if (_objs[i].obj_nr && !_objs[i].fl_object_index)
setupRoomObject(&_objs[i], room); setupRoomObject(&_objs[i], room);
} }