libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 02:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
svn-id: r31924
This commit is contained in:
Nicola Mettifogo 2008-05-07 12:44:22 +00:00
parent 6e61b02cb9
commit 3d3ad58e14
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/parallaction/parallaction.cpp
View File

@ -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];
}

6
engines/parallaction/parallaction.h
View File

@ -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];