From e2e2af4ff5f66ffce70f8ac389112778eb9b142e Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Thu, 8 May 2008 02:46:12 +0000
Subject: Reverted commit 31928 by Buddha_, and defined kFlagsAll as
 0xFFFFFFFFU in the enum, as suggested by Fingolfin.

svn-id: r31939
---
 engines/parallaction/objects.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index 5b33799985..da9eaac95f 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -94,6 +94,8 @@ enum ZoneFlags {
 
 
 enum CommandFlags {
+	kFlagsAll			= 0xFFFFFFFFU,
+
 	kFlagsVisited		= 1,
 	kFlagsExit			= 0x10000000,
 	kFlagsEnter			= 0x20000000,
@@ -102,13 +104,6 @@ enum CommandFlags {
 	// 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 {
-- 
cgit v1.2.3