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

[peres001 at users.sourceforge.net]

Revision: 31939
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31939&view=rev
Author:   peres001
Date:     2008-05-07 19:46:12 -0700 (Wed, 07 May 2008)

Log Message:
-----------
Reverted commit 31928 by Buddha_, and defined kFlagsAll as 0xFFFFFFFFU in the enum, as suggested by Fingolfin.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/objects.h

Modified: scummvm/trunk/engines/parallaction/objects.h
===================================================================
--- scummvm/trunk/engines/parallaction/objects.h	2008-05-08 01:27:36 UTC (rev 31938)
+++ scummvm/trunk/engines/parallaction/objects.h	2008-05-08 02:46:12 UTC (rev 31939)
@@ -94,6 +94,8 @@
 
 
 enum CommandFlags {
+	kFlagsAll			= 0xFFFFFFFFU,
+
 	kFlagsVisited		= 1,
 	kFlagsExit			= 0x10000000,
 	kFlagsEnter			= 0x20000000,
@@ -102,15 +104,8 @@
 	// BRA specific
 	kFlagsTestTrue		= 2
 };
-// This was moved here from inside the enum CommandFlags above because at
-// least MSVC8 uses a signed int for representing enumerations and kFlagsAll
-// uses an unsigned int value that can't be represented directly with a signed
-// int (It's represented as -1 instead of 0xFFFFFFFF). Casting the enum values
-// to unsigned ints when needed would've been another way to fix this.
-const uint32 kFlagsAll = 0xFFFFFFFF;
 
 
-
 struct CommandData {
 	uint32			_flags;
 	ZonePtr			_zone;


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