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

Removed some not necessary #defines which could (and did) lead to program

Browse source 
logic misinterpretation. I assume these were added for readability, but
 (a) names suggestet that they're class variables but they didn't
 (b) their use wasn't consistent, i.e. there were places where variables were
     used directly, not by means of the macros
 (c) they didn't save that much space because they are used in few places.

svn-id: r15179
This commit is contained in:
Eugene Sandulenko 2004-09-19 00:15:17 +00:00
parent 4869c2f9c1
commit 64043ff1fc
6 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/object.cpp
View file

@ -898,8 +898,8 @@ void ScummEngine::clearOwnerOf(int obj) {
if (!a[0] && a[1]) {
a[0] = a[1];
a[1] = 0;
_baseInventoryItems[i] = _baseInventoryItems[i + 1];
_baseInventoryItems[i + 1] = NULL;
res.address[rtInventory][i] = res.address[rtInventory][i + 1];
res.address[rtInventory][i + 1] = NULL;
}
}
return;
@ -1597,7 +1597,7 @@ int ScummEngine::findLocalObjectSlot() {
int ScummEngine::findFlObjectSlot() {
int i;
for (i = 1; i < _numFlObject; i++) {
if (_baseFLObject[i] == NULL)
if (res.address[rtFlObject][i] == NULL)
return i;
}
error("findFlObjectSlot: Out of FLObject slots");