libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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
Show Stats 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");

16
scumm/resource.cpp
View File

@ -229,13 +229,13 @@ void ScummEngine::openRoom(int room) {
if (_features & GF_EXTERNAL_CHARSET && room >= roomlimit)
room_offs = 0;
else
room_offs = room ? _roomFileOffsets[room] : 0;
room_offs = room ? res.roomoffs[rtRoom][room] : 0;
if (room_offs == -1)
break;
if (room_offs != 0 && room != 0) {
_fileOffset = _roomFileOffsets[room];
_fileOffset = res.roomoffs[rtRoom][room];
return;
}
if (!(_features & GF_SMALL_HEADER)) {
@ -296,7 +296,7 @@ void ScummEngine::openRoom(int room) {
if (_features & GF_EXTERNAL_CHARSET && room >= roomlimit)
return;
readRoomsOffsets();
_fileOffset = _roomFileOffsets[room];
_fileOffset = res.roomoffs[rtRoom][room];
if (_fileOffset != 8)
return;
@ -333,8 +333,8 @@ void ScummEngine::deleteRoomOffsets() {
return;
for (int i = 0; i < _numRooms; i++) {
if (_roomFileOffsets[i] != 0xFFFFFFFF)
_roomFileOffsets[i] = 0;
if (res.roomoffs[rtRoom][i] != 0xFFFFFFFF)
res.roomoffs[rtRoom][i] = 0;
}
}
@ -353,7 +353,7 @@ void ScummEngine::readRoomsOffsets() {
num = READ_LE_UINT16(_heV7RoomOffsets);
ptr = _heV7RoomOffsets + 2;
for (i = 0; i < num; i++) {
_roomFileOffsets[i] = READ_LE_UINT32(ptr);
res.roomoffs[rtRoom][i] = READ_LE_UINT32(ptr);
ptr += 4;
}
return;
@ -371,8 +371,8 @@ void ScummEngine::readRoomsOffsets() {
num = _fileHandle.readByte();
while (num--) {
room = _fileHandle.readByte();
if (_roomFileOffsets[room] != 0xFFFFFFFF) {
_roomFileOffsets[room] = _fileHandle.readUint32LE();
if (res.roomoffs[rtRoom][room] != 0xFFFFFFFF) {
res.roomoffs[rtRoom][room] = _fileHandle.readUint32LE();
} else {
_fileHandle.readUint32LE();
}

8
scumm/script.cpp
View File

@ -382,7 +382,7 @@ void ScummEngine::getScriptBaseAddress() {
break;
_scriptOrgPointer = getResourceAddress(rtInventory, idx);
assert(idx < _numInventory);
_lastCodePtr = &_baseInventoryItems[idx];
_lastCodePtr = &res.address[rtInventory][idx];
break;
case WIO_LOCAL:
@ -394,14 +394,14 @@ void ScummEngine::getScriptBaseAddress() {
} else {
_scriptOrgPointer = getResourceAddress(rtRoom, _roomResource);
assert(_roomResource < _numRooms);
_lastCodePtr = &_baseRooms[_roomResource];
_lastCodePtr = &res.address[rtRoom][_roomResource];
}
break;
case WIO_GLOBAL: /* global script */
_scriptOrgPointer = getResourceAddress(rtScript, ss->number);
assert(ss->number < _numScripts);
_lastCodePtr = &_baseScripts[ss->number];
_lastCodePtr = &res.address[rtScript][ss->number];
break;
case WIO_FLOBJECT: /* flobject script */
@ -410,7 +410,7 @@ void ScummEngine::getScriptBaseAddress() {
idx = _objs[idx].fl_object_index;
_scriptOrgPointer = getResourceAddress(rtFlObject, idx);
assert(idx < _numFlObject);
_lastCodePtr = &_baseFLObject[idx];
_lastCodePtr = &res.address[rtFlObject][idx];
break;
default:
error("Bad type while getting base address");

2
scumm/script_v6.cpp
View File

@ -474,7 +474,7 @@ void ScummEngine_v6::nukeArray(int a) {
}
int ScummEngine_v6::findFreeArrayId() {
byte **addr = _baseArrays;
byte **addr = res.address[rtString];
int i;
for (i = 1; i < _numArray; i++) {

2
scumm/script_v72he.cpp
View File

@ -875,7 +875,7 @@ void ScummEngine_v72he::o72_getArrayDimSize() {
}
void ScummEngine_v72he::o72_getNumFreeArrays() {
byte **addr = _baseArrays;
byte **addr = res.address[rtString];
int i, num = 0;
for (i = 1; i < _numArray; i++) {

8
scumm/scumm.h
View File

@ -260,14 +260,6 @@ enum ScummGameId {
GID_FREDDI4
};
#define _baseRooms res.address[rtRoom]
#define _baseScripts res.address[rtScript]
#define _baseInventoryItems res.address[rtInventory]
#define _baseFLObject res.address[rtFlObject]
#define _baseArrays res.address[rtString]
#define _roomFileOffsets res.roomoffs[rtRoom]
struct SentenceTab {
byte verb;
byte preposition;