diff options
author | Filippos Karapetis | 2008-05-07 08:29:11 +0000 |
---|---|---|
committer | Filippos Karapetis | 2008-05-07 08:29:11 +0000 |
commit | a3dbf43629b44c49156c33ff5b178ec8aaf93a03 (patch) | |
tree | c3bb9b8b75654378acd13e29d604e9b0135d09c2 | |
parent | 8f9cc2e1645e8878f7804ff47769490dc830858f (diff) | |
download | scummvm-rg350-a3dbf43629b44c49156c33ff5b178ec8aaf93a03.tar.gz scummvm-rg350-a3dbf43629b44c49156c33ff5b178ec8aaf93a03.tar.bz2 scummvm-rg350-a3dbf43629b44c49156c33ff5b178ec8aaf93a03.zip |
Fixed signed/unsigned issues with kFlagsAll
svn-id: r31920
-rw-r--r-- | engines/parallaction/parallaction.cpp | 8 | ||||
-rw-r--r-- | engines/parallaction/parallaction.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 649f21ae96..862379bd2e 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -737,19 +737,19 @@ void Parallaction::doLocationEnterTransition() { return; } -void Parallaction::setLocationFlags(uint32 flags) { +void Parallaction::setLocationFlags(int32 flags) { _localFlags[_currentLocationIndex] |= flags; } -void Parallaction::clearLocationFlags(uint32 flags) { +void Parallaction::clearLocationFlags(int32 flags) { _localFlags[_currentLocationIndex] &= ~flags; } -void Parallaction::toggleLocationFlags(uint32 flags) { +void Parallaction::toggleLocationFlags(int32 flags) { _localFlags[_currentLocationIndex] ^= flags; } -uint32 Parallaction::getLocationFlags() { +int32 Parallaction::getLocationFlags() { return _localFlags[_currentLocationIndex]; } diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 19ce437410..e19ffd0a34 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -362,10 +362,10 @@ public: Character _char; - void setLocationFlags(uint32 flags); - void clearLocationFlags(uint32 flags); - void toggleLocationFlags(uint32 flags); - uint32 getLocationFlags(); + void setLocationFlags(int32 flags); + void clearLocationFlags(int32 flags); + void toggleLocationFlags(int32 flags); + int32 getLocationFlags(); uint32 _localFlags[NUM_LOCATIONS]; char _locationNames[NUM_LOCATIONS][32]; |