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

[athrxx at users.sourceforge.net]

Revision: 46434
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46434&view=rev
Author:   athrxx
Date:     2009-12-20 16:23:44 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
LOL: removed unused variable

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/timer_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-12-20 14:52:29 UTC (rev 46433)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-12-20 16:23:44 UTC (rev 46434)
@@ -238,7 +238,6 @@
 	_lightningSfxFrame = 0;
 
 	_compassTimer = 0;
-	_timer3Para = 0;
 	_scriptCharacterCycle = 0;
 	_partyDamageFlags = -1;
 
@@ -3511,7 +3510,6 @@
 		}
 	}
 
-	_timer3Para = 1;
 	_timer->enable(3);
 }
 

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-12-20 14:52:29 UTC (rev 46433)
+++ scummvm/trunk/engines/kyra/lol.h	2009-12-20 16:23:44 UTC (rev 46434)
@@ -455,7 +455,6 @@
 
 	static const uint8 _clock2Timers[];
 	static const uint8 _numClock2Timers;
-	int _timer3Para;
 
 	// sound
 	int convertVolumeToMixer(int value);

Modified: scummvm/trunk/engines/kyra/timer_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_lol.cpp	2009-12-20 14:52:29 UTC (rev 46433)
+++ scummvm/trunk/engines/kyra/timer_lol.cpp	2009-12-20 16:23:44 UTC (rev 46434)
@@ -107,7 +107,7 @@
 }
 
 void LoLEngine::timerSpecialCharacterUpdate(int timerNum) {
-	int v = 0;
+	int eventsLeft = 0;
 	for (int i = 0; i < 4; i++) {
 		if (!(_characters[i].flags & 1))
 			continue;
@@ -117,8 +117,8 @@
 				continue;
 
 			if (--_characters[i].characterUpdateDelay[ii] > 0) {
-				if (_characters[i].characterUpdateDelay[ii] > v)
-					v = _characters[i].characterUpdateDelay[ii];
+				if (_characters[i].characterUpdateDelay[ii] > eventsLeft)
+					eventsLeft = _characters[i].characterUpdateDelay[ii];
 				continue;
 			}
 
@@ -127,8 +127,8 @@
 				if (_characters[i].weaponHit) {
 					_characters[i].weaponHit = 0;
 					_characters[i].characterUpdateDelay[ii] = calcMonsterSkillLevel(i, 6);
-					if (_characters[i].characterUpdateDelay[ii] > v)
-						v = _characters[i].characterUpdateDelay[ii];
+					if (_characters[i].characterUpdateDelay[ii] > eventsLeft)
+						eventsLeft = _characters[i].characterUpdateDelay[ii];
 				} else {
 					_characters[i].flags &= 0xfffb;
 				}
@@ -147,12 +147,12 @@
 				break;
 
 			case 3:
-				v = rollDice(1, 2);
-				if (inflictDamage(i, v, 0x8000, 0, 0x80)) {
+				eventsLeft = rollDice(1, 2);
+				if (inflictDamage(i, eventsLeft, 0x8000, 0, 0x80)) {
 					_txt->printMessage(2, getLangString(0x4022), _characters[i].name);
 					_characters[i].characterUpdateDelay[ii] = 10;
-					if (_characters[i].characterUpdateDelay[ii] > v)
-						v = _characters[i].characterUpdateDelay[ii];
+					if (_characters[i].characterUpdateDelay[ii] > eventsLeft)
+						eventsLeft = _characters[i].characterUpdateDelay[ii];
 				}
 				break;
 
@@ -184,12 +184,10 @@
 		}
 	}
 
-	if (v) {
+	if (eventsLeft)
 		_timer->enable(3);
-		_timer3Para = v * 15;
-	} else {
+	else
 		_timer->disable(3);
-	}
 }
 
 void LoLEngine::timerProcessFlyingObjects(int timerNum) {


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