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

[peres001 at users.sourceforge.net]

Revision: 31924
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31924&view=rev
Author:   peres001
Date:     2008-05-07 05:44:22 -0700 (Wed, 07 May 2008)

Log Message:
-----------
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.

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 12:34:40 UTC (rev 31923)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2008-05-07 12:44:22 UTC (rev 31924)
@@ -737,7 +737,7 @@
 	return;
 }
 
-void Parallaction::setLocationFlags(int32 flags) {
+void Parallaction::setLocationFlags(uint32 flags) {
 	_localFlags[_currentLocationIndex] |= flags;
 }
 
@@ -745,11 +745,11 @@
 	_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];
 }
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2008-05-07 12:34:40 UTC (rev 31923)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2008-05-07 12:44:22 UTC (rev 31924)
@@ -362,10 +362,10 @@
 
 	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];


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