diff options
author | Nicola Mettifogo | 2008-05-07 12:44:22 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2008-05-07 12:44:22 +0000 |
commit | 3d3ad58e143d82103dce9f8ac7e816e9979131bc (patch) | |
tree | 96c92d6818fd5649fe2544ecaaf08469ee8f33b0 /engines/parallaction | |
parent | 6e61b02cb9c44fd07fe65d7901fe1e4ed765b0c5 (diff) | |
download | scummvm-rg350-3d3ad58e143d82103dce9f8ac7e816e9979131bc.tar.gz scummvm-rg350-3d3ad58e143d82103dce9f8ac7e816e9979131bc.tar.bz2 scummvm-rg350-3d3ad58e143d82103dce9f8ac7e816e9979131bc.zip |
Reverting commit 31920, thus changing type of flags back to unsigned. If some compiler emits a warning about 0xFFFFFFFF not being an unsigned immediate, then we need to find out how to convince it without changing types of variables in the code.
svn-id: r31924
Diffstat (limited to 'engines/parallaction')
-rw-r--r-- | engines/parallaction/parallaction.cpp | 6 | ||||
-rw-r--r-- | engines/parallaction/parallaction.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 402738758a..649f21ae96 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -737,7 +737,7 @@ void Parallaction::doLocationEnterTransition() { return; } -void Parallaction::setLocationFlags(int32 flags) { +void Parallaction::setLocationFlags(uint32 flags) { _localFlags[_currentLocationIndex] |= flags; } @@ -745,11 +745,11 @@ void Parallaction::clearLocationFlags(uint32 flags) { _localFlags[_currentLocationIndex] &= ~flags; } -void Parallaction::toggleLocationFlags(int32 flags) { +void Parallaction::toggleLocationFlags(uint32 flags) { _localFlags[_currentLocationIndex] ^= flags; } -int32 Parallaction::getLocationFlags() { +uint32 Parallaction::getLocationFlags() { return _localFlags[_currentLocationIndex]; } diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index a818702f5d..19ce437410 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -362,10 +362,10 @@ public: Character _char; - void setLocationFlags(int32 flags); + void setLocationFlags(uint32 flags); void clearLocationFlags(uint32 flags); - void toggleLocationFlags(int32 flags); - int32 getLocationFlags(); + void toggleLocationFlags(uint32 flags); + uint32 getLocationFlags(); uint32 _localFlags[NUM_LOCATIONS]; char _locationNames[NUM_LOCATIONS][32]; |