diff options
| author | Nicola Mettifogo | 2008-05-08 02:46:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-05-08 02:46:12 +0000 |
| commit | e2e2af4ff5f66ffce70f8ac389112778eb9b142e (patch) | |
| tree | 0c5a624232ffd2045e14ae7b9c407aed777d8e2a /engines | |
| parent | 0c827c8cebf3709e980bb90be32b004acda058b8 (diff) | |
| download | scummvm-rg350-e2e2af4ff5f66ffce70f8ac389112778eb9b142e.tar.gz scummvm-rg350-e2e2af4ff5f66ffce70f8ac389112778eb9b142e.tar.bz2 scummvm-rg350-e2e2af4ff5f66ffce70f8ac389112778eb9b142e.zip | |
Reverted commit 31928 by Buddha_, and defined kFlagsAll as 0xFFFFFFFFU in the enum, as suggested by Fingolfin.
svn-id: r31939
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/parallaction/objects.h | 9 |
1 files changed, 2 insertions, 7 deletions
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 { |