aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/timer_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-08-07 03:31:15 +0200
committerJohannes Schickel2011-12-26 16:18:13 +0100
commitfc5b29fdbcf4170436a32da2c1f4b078b1f1f90f (patch)
tree48bb02e631def4d4d1fb95bcc44daa0af449a1b5 /engines/kyra/timer_eob.cpp
parentbac0caeb0ff712fe9002985c44c1ea651b86e018 (diff)
downloadscummvm-rg350-fc5b29fdbcf4170436a32da2c1f4b078b1f1f90f.tar.gz
scummvm-rg350-fc5b29fdbcf4170436a32da2c1f4b078b1f1f90f.tar.bz2
scummvm-rg350-fc5b29fdbcf4170436a32da2c1f4b078b1f1f90f.zip
KYRA: (EOB) - implemented some spells and fixed more bugs
Diffstat (limited to 'engines/kyra/timer_eob.cpp')
-rw-r--r--engines/kyra/timer_eob.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index ba4d6a2475..20a05f9ee6 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -203,7 +203,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
for (int ii = 0; ii < 10; ii++) {
if (c->timers[ii] > ct) {
uint32 chrt = c->timers[ii] - ct;
- c->timers[ii] = chrt > millis ? chrt - millis : ct;
+ c->timers[ii] = chrt > millis ? ct + chrt - millis : ct;
}
}
}
@@ -214,7 +214,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
for (int i = 0; i < _scriptTimersCount; i++) {
if (_scriptTimers[i].next > ct) {
uint32 chrt = _scriptTimers[i].next - ct;
- _scriptTimers[i].next = chrt > millis ? chrt - millis : ct;
+ _scriptTimers[i].next = chrt > millis ? ct + chrt - millis : ct;
}
}
}
@@ -331,7 +331,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
case 9:
if (c->flags & 4) {
_txt->printMessage(_characterStatusStrings9[0], -1, c->name);
- c->flags &= 0xfb;
+ c->flags &= ~4;
gui_drawCharPortraitWithStats(charIndex);
}
break;