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

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Wed May 7 16:49:42 CEST 2008


Revision: 31928
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31928&view=rev
Author:   buddha_
Date:     2008-05-07 07:49:42 -0700 (Wed, 07 May 2008)

Log Message:
-----------
A (temporary?) fix for the signed/unsigned issues with enum CommandFlags usage.

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

Modified: scummvm/trunk/engines/parallaction/objects.h
===================================================================
--- scummvm/trunk/engines/parallaction/objects.h	2008-05-07 14:31:45 UTC (rev 31927)
+++ scummvm/trunk/engines/parallaction/objects.h	2008-05-07 14:49:42 UTC (rev 31928)
@@ -94,8 +94,6 @@
 
 
 enum CommandFlags {
-	kFlagsAll			= 0xFFFFFFFF,
-
 	kFlagsVisited		= 1,
 	kFlagsExit			= 0x10000000,
 	kFlagsEnter			= 0x20000000,
@@ -104,6 +102,12 @@
 	// 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;
 
 
 


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