[Scummvm-cvs-logs] SF.net SVN: scummvm: [25680] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 25680
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25680&view=rev
Author:   peres001
Date:     2007-02-18 02:56:45 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
replaced magic number with kFlagsVisited where needed

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/commands.h
    scummvm/trunk/engines/parallaction/location.cpp

Modified: scummvm/trunk/engines/parallaction/commands.h
===================================================================
--- scummvm/trunk/engines/parallaction/commands.h	2007-02-18 10:32:15 UTC (rev 25679)
+++ scummvm/trunk/engines/parallaction/commands.h	2007-02-18 10:56:45 UTC (rev 25680)
@@ -28,6 +28,7 @@
 namespace Parallaction {
 
 enum CommandFlags {
+	kFlagsVisited		= 1,
 	kFlagsExit			= 0x10000000,
 	kFlagsEnter 		= 0x20000000,
 	kFlagsGlobal		= 0x40000000

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-02-18 10:32:15 UTC (rev 25679)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-02-18 10:56:45 UTC (rev 25680)
@@ -109,7 +109,7 @@
 				_locationNames[_numLocations][0] = '\0';
 				_localFlags[_currentLocationIndex] = 0;
 			} else {
-				_localFlags[_currentLocationIndex] |= 1;	// 'visited'
+				_localFlags[_currentLocationIndex] |= kFlagsVisited;	// 'visited'
 			}
 
 			strcpy(_location, _tokens[1]);
@@ -145,7 +145,7 @@
 			_locationACommands = parseCommands(file);
 		}
 		if (!scumm_stricmp(_tokens[0], "FLAGS")) {
-			if ((_localFlags[_currentLocationIndex] & 1) == 0) {
+			if ((_localFlags[_currentLocationIndex] & kFlagsVisited) == 0) {
 				// only for 1st visit
 				_localFlags[_currentLocationIndex] = 0;
 				_si = 1;
@@ -495,7 +495,7 @@
 	debugC(1, kDebugLocation, "doLocationEnterTransition");
 
 	byte v60[PALETTE_SIZE];
-	if (_localFlags[_currentLocationIndex] & 1) return; // visited
+	if (_localFlags[_currentLocationIndex] & kFlagsVisited) return; // visited
 
 	_vm->_graphics->buildBWPalette(v60);
 	_vm->_graphics->setPalette(v60);


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