[Scummvm-cvs-logs] SF.net SVN: scummvm: [20838] scummvm/trunk/engines/simon/simon.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Thu Feb 23 14:39:04 CET 2006
Revision: 20838
Author: eriktorbjorn
Date: 2006-02-23 14:38:16 -0800 (Thu, 23 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20838&view=rev
Log Message:
-----------
I assume -1 and 0xFFFFFFFF are supposed to be the same value when assigned to
_lastHitArea3, so use -1 consistently.
Modified Paths:
--------------
scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-02-23 20:02:46 UTC (rev 20837)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-02-23 22:38:16 UTC (rev 20838)
@@ -1640,7 +1640,7 @@
}
delay(100);
- } while (_lastHitArea3 == (HitArea *) 0xFFFFFFFF || _lastHitArea3 == 0);
+ } while (_lastHitArea3 == (HitArea *) -1 || _lastHitArea3 == 0);
if (_lastHitArea == NULL) {
} else if (_lastHitArea->id == 0x7FFB) {
@@ -1782,7 +1782,7 @@
setup_hitarea_from_pos(_mouseX, _mouseY, x);
_lastHitArea3 = _lastHitArea;
if (x == 1 && _lastHitArea == NULL)
- _lastHitArea3 = (HitArea *) - 1;
+ _lastHitArea3 = (HitArea *) -1;
get_out:
drawMousePointer();
@@ -2089,7 +2089,7 @@
if (_keyPressed == 35)
f10_key();
processSpecialKeys();
- if (_lastHitArea3 == (HitArea *) 0xFFFFFFFF)
+ if (_lastHitArea3 == (HitArea *) -1)
goto startOver;
if (_lastHitArea3 != 0)
break;
More information about the Scummvm-git-logs
mailing list