aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2008-06-10 21:06:39 +0000
committerFilippos Karapetis2008-06-10 21:06:39 +0000
commit985903a071cbf494ef5421f4e3718f101e7e5bcf (patch)
tree83ff77bdc1de328517f89267afbc81da157eaa98
parentfdf3f36bc6e22d1934e97852c7709ff39867ba5f (diff)
downloadscummvm-rg350-985903a071cbf494ef5421f4e3718f101e7e5bcf.tar.gz
scummvm-rg350-985903a071cbf494ef5421f4e3718f101e7e5bcf.tar.bz2
scummvm-rg350-985903a071cbf494ef5421f4e3718f101e7e5bcf.zip
Use the array sizes loaded from drascula.dat, instead of ARRAYSIZE
svn-id: r32650
-rw-r--r--engines/drascula/rooms.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 475b6c4b49..6c4fb82b13 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -120,7 +120,7 @@ void DrasculaEngine::setupRoomsTable() {
bool DrasculaEngine::roomParse(int rN, int fl) {
bool seen = false;
- for (int i = 0; i < ARRAYSIZE(_roomActions); i++) {
+ for (int i = 0; i < _roomActionsSize; i++) {
if (_roomActions[i].room == rN) {
seen = true;
if (_roomActions[i].chapter == currentChapter ||
@@ -1013,7 +1013,7 @@ bool DrasculaEngine::room_102(int fl) {
void DrasculaEngine::updateRefresh() {
// Check generic updaters
- for (int i = 0; i < ARRAYSIZE(_roomUpdates); i++) {
+ for (int i = 0; i < _roomUpdatesSize; i++) {
if (_roomUpdates[i].roomNum == roomNumber) {
if (_roomUpdates[i].flag < 0 ||
flags[_roomUpdates[i].flag] == _roomUpdates[i].flagValue) {
@@ -1051,7 +1051,7 @@ void DrasculaEngine::updateRefresh() {
void DrasculaEngine::updateRefresh_pre() {
// Check generic preupdaters
- for (int i = 0; i < ARRAYSIZE(_roomPreUpdates); i++) {
+ for (int i = 0; i < _roomPreUpdatesSize; i++) {
if (_roomPreUpdates[i].roomNum == roomNumber) {
if (_roomPreUpdates[i].flag < 0 ||
flags[_roomPreUpdates[i].flag] == _roomPreUpdates[i].flagValue) {