[Scummvm-cvs-logs] SF.net SVN: scummvm: [32650] scummvm/trunk/engines/drascula/rooms.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jun 10 23:06:39 CEST 2008


Revision: 32650
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32650&view=rev
Author:   thebluegr
Date:     2008-06-10 14:06:39 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Use the array sizes loaded from drascula.dat, instead of ARRAYSIZE

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/rooms.cpp

Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp	2008-06-10 20:57:22 UTC (rev 32649)
+++ scummvm/trunk/engines/drascula/rooms.cpp	2008-06-10 21:06:39 UTC (rev 32650)
@@ -120,7 +120,7 @@
 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 @@
 
 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_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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list