[Scummvm-cvs-logs] SF.net SVN: scummvm: [31920] scummvm/trunk/engines/parallaction

[thebluegr at users.sourceforge.net]

Revision: 31920
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31920&view=rev
Author:   thebluegr
Date:     2008-05-07 01:29:11 -0700 (Wed, 07 May 2008)

Log Message:
-----------
Fixed signed/unsigned issues with kFlagsAll

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2008-05-07 08:25:13 UTC (rev 31919)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2008-05-07 08:29:11 UTC (rev 31920)
@@ -737,19 +737,19 @@
 	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];
 }
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2008-05-07 08:25:13 UTC (rev 31919)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2008-05-07 08:29:11 UTC (rev 31920)
@@ -362,10 +362,10 @@
 
 	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];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.