[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.185,1.186 resource.cpp,1.273,1.274 script.cpp,1.195,1.196 script_v6.cpp,1.404,1.405 script_v72he.cpp,2.107,2.108 scumm.h,1.487,1.488
Eugene Sandulenko
sev at users.sourceforge.net
Sat Sep 18 17:16:56 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162
Modified Files:
object.cpp resource.cpp script.cpp script_v6.cpp
script_v72he.cpp scumm.h
Log Message:
Removed some not necessary #defines which could (and did) lead to program
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.
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- object.cpp 18 Sep 2004 22:42:43 -0000 1.185
+++ object.cpp 19 Sep 2004 00:15:07 -0000 1.186
@@ -898,8 +898,8 @@
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::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");
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- resource.cpp 18 Sep 2004 23:48:48 -0000 1.273
+++ resource.cpp 19 Sep 2004 00:15:08 -0000 1.274
@@ -229,13 +229,13 @@
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 @@
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 @@
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 @@
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 @@
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();
}
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- script.cpp 17 Sep 2004 05:43:37 -0000 1.195
+++ script.cpp 19 Sep 2004 00:15:09 -0000 1.196
@@ -382,7 +382,7 @@
break;
_scriptOrgPointer = getResourceAddress(rtInventory, idx);
assert(idx < _numInventory);
- _lastCodePtr = &_baseInventoryItems[idx];
+ _lastCodePtr = &res.address[rtInventory][idx];
break;
case WIO_LOCAL:
@@ -394,14 +394,14 @@
} 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 @@
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");
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- script_v6.cpp 18 Sep 2004 22:42:43 -0000 1.404
+++ script_v6.cpp 19 Sep 2004 00:15:09 -0000 1.405
@@ -474,7 +474,7 @@
}
int ScummEngine_v6::findFreeArrayId() {
- byte **addr = _baseArrays;
+ byte **addr = res.address[rtString];
int i;
for (i = 1; i < _numArray; i++) {
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.107
retrieving revision 2.108
diff -u -d -r2.107 -r2.108
--- script_v72he.cpp 18 Sep 2004 22:26:19 -0000 2.107
+++ script_v72he.cpp 19 Sep 2004 00:15:17 -0000 2.108
@@ -875,7 +875,7 @@
}
void ScummEngine_v72he::o72_getNumFreeArrays() {
- byte **addr = _baseArrays;
+ byte **addr = res.address[rtString];
int i, num = 0;
for (i = 1; i < _numArray; i++) {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -d -r1.487 -r1.488
--- scumm.h 18 Sep 2004 23:48:48 -0000 1.487
+++ scumm.h 19 Sep 2004 00:15:17 -0000 1.488
@@ -260,14 +260,6 @@
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;
More information about the Scummvm-git-logs
mailing list