LOL: - added some spell casting (spark, heal, swarm)

- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420

1 files changed, 2 insertions, 2 deletions

diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index 79bb8d1c2d..05e8e75144 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -53,7 +53,7 @@ void LoLEngine::setupTimers() {
 
 void LoLEngine::enableTimer(int id) {
 	_timer->enable(id);
-	_timer->setNextRun(id, _system->getMillis() + _timer->getDelay(id) * _tickLength);
+	_timer->setCountdown(id, _timer->getDelay(id));
 }
 
 void LoLEngine::enableSysTimer(int sysTimer) {
@@ -249,7 +249,7 @@ void LoLEngine::timerUpdatePortraitAnimations(int skipUpdate) {
 }
 
 void LoLEngine::timerUpdateLampState(int timerNum) {
-	if ((_gameFlags[15] & 0x800) && (_gameFlags[15] & 0x400) && _lampOilStatus)
+	if ((_gameFlags[15] & 0x800) && (_gameFlags[15] & 0x400) && _lampOilStatus > 0)
 		_lampOilStatus--;
 }