diff options
author | Kari Salminen | 2008-05-07 14:49:42 +0000 |
---|---|---|
committer | Kari Salminen | 2008-05-07 14:49:42 +0000 |
commit | 2d707af33825097e3fd0c001101d9a2691e9ff6f (patch) | |
tree | a14432bea744f449adece6c4a082ab769a547351 | |
parent | 600ab40bcab24d3c1c8d98d3fefefa6026f03382 (diff) | |
download | scummvm-rg350-2d707af33825097e3fd0c001101d9a2691e9ff6f.tar.gz scummvm-rg350-2d707af33825097e3fd0c001101d9a2691e9ff6f.tar.bz2 scummvm-rg350-2d707af33825097e3fd0c001101d9a2691e9ff6f.zip |
A (temporary?) fix for the signed/unsigned issues with enum CommandFlags usage.
svn-id: r31928
-rw-r--r-- | engines/parallaction/objects.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index cfb78f941b..5b33799985 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -94,8 +94,6 @@ enum ZoneFlags { enum CommandFlags { - kFlagsAll = 0xFFFFFFFF, - kFlagsVisited = 1, kFlagsExit = 0x10000000, kFlagsEnter = 0x20000000, @@ -104,6 +102,12 @@ 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; |