[Scummvm-cvs-logs] SF.net SVN: scummvm:[40443] scummvm/trunk/engines/kyra/gui_lol.cpp

[athrxx at users.sourceforge.net]

Revision: 40443
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40443&view=rev
Author:   athrxx
Date:     2009-05-10 23:53:05 +0000 (Sun, 10 May 2009)

Log Message:
-----------
LOL: - fix last commit

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lol.cpp

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-05-10 23:08:32 UTC (rev 40442)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-05-10 23:53:05 UTC (rev 40443)
@@ -747,9 +747,9 @@
 	evt.mouse.x = _mouseX;
 	evt.mouse.y = _mouseY;
 
-	if (eventType == 65) {
+	if (eventType == 65 || eventType == 199) {
 		evt.type = Common::EVENT_LBUTTONDOWN;
-	} else if (eventType == 66) {
+	} else if (eventType == 66 || eventType == 201) {
 		evt.type = Common::EVENT_RBUTTONDOWN;
 	} else {
 		evt.type = Common::EVENT_KEYDOWN;
@@ -1617,49 +1617,51 @@
 			int f = checkInput(0);
 			removeInputTop();
 
-			if (f & !(f & 0x800)) {
+			if (f & 0x800) {
+				gui_notifyButtonListChanged();
+			} else if (f) {
 				gui_triggerEvent(f);
-			} else {
-				gui_notifyButtonListChanged();
-			
-				if (!_partyAwake) {					
-					if (_system->getMillis() > delay3) {
-						for (int i = 0; i < 4; i++) {							
-							if (!(needPoisoningFlags & (1 << i)))
-								continue;
-							inflictDamage(i, 1, 0x8000, 1, 0x80);
-							if (_characters[i].flags & 8)
-								needPoisoningFlags &= ~(1 << i);
-						}
-						delay3 = _system->getMillis() + a * _tickLength;
+				break;
+			}					
+						
+			if (!_partyAwake) {					
+				if (_system->getMillis() > delay3) {
+					for (int i = 0; i < 4; i++) {							
+						if (!(needPoisoningFlags & (1 << i)))
+							continue;
+						inflictDamage(i, 1, 0x8000, 1, 0x80);
+						if (_characters[i].flags & 8)
+							needPoisoningFlags &= ~(1 << i);
 					}
+					delay3 = _system->getMillis() + a * _tickLength;
+				}
 					
-					if (_system->getMillis() > delay1) {
-						for (int i = 0; i < 4; i++) {							
-							if (!(needHealingFlags & (1 << i)))
-								continue;
-							increaseCharacterHitpoints(i, 1, false);
-							gui_drawCharPortraitWithStats(i);
-							if (_characters[i].hitPointsCur == _characters[i].hitPointsMax)
-								needHealingFlags &= ~(1 << i);
-						}						
-						delay1 = _system->getMillis() + h * _tickLength;
-					}
+				if (_system->getMillis() > delay1) {
+					for (int i = 0; i < 4; i++) {							
+						if (!(needHealingFlags & (1 << i)))
+							continue;
+						increaseCharacterHitpoints(i, 1, false);
+						gui_drawCharPortraitWithStats(i);
+						if (_characters[i].hitPointsCur == _characters[i].hitPointsMax)
+							needHealingFlags &= ~(1 << i);
+					}						
+					delay1 = _system->getMillis() + h * _tickLength;
+				}
 
-					if (_system->getMillis() > delay2) {
-						for (int i = 0; i < 4; i++) {							
-							if (!(needMagicGainFlags & (1 << i)))
-								continue;
-							_characters[i].magicPointsCur++;														
-							gui_drawCharPortraitWithStats(i);
-							if (_characters[i].magicPointsCur == _characters[i].magicPointsMax)
-								needMagicGainFlags &= ~(1 << i);
-						}						
-						delay2 = _system->getMillis() + m * _tickLength;
-					}
-					_screen->updateScreen();
+				if (_system->getMillis() > delay2) {
+					for (int i = 0; i < 4; i++) {							
+						if (!(needMagicGainFlags & (1 << i)))
+							continue;
+						_characters[i].magicPointsCur++;														
+						gui_drawCharPortraitWithStats(i);
+						if (_characters[i].magicPointsCur == _characters[i].magicPointsMax)
+							needMagicGainFlags &= ~(1 << i);
+					}						
+					delay2 = _system->getMillis() + m * _tickLength;
 				}
+				_screen->updateScreen();
 			}
+		
 		} while (!_partyAwake && (needHealingFlags || needMagicGainFlags));
 		
 		for (int i = 0; i < 4; i++) {


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