aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorEugene Sandulenko2011-08-05 10:15:20 +0100
committerEugene Sandulenko2011-08-06 11:28:35 +0100
commit78f1ea769060cd631c210fc01020bb921afe3607 (patch)
tree3d12aedc45efe68e6e5d81ee24d90c428bfc186c /engines/sci
parente72c2fae8896b14553f2e2246726b2e426f0e9bb (diff)
downloadscummvm-rg350-78f1ea769060cd631c210fc01020bb921afe3607.tar.gz
scummvm-rg350-78f1ea769060cd631c210fc01020bb921afe3607.tar.bz2
scummvm-rg350-78f1ea769060cd631c210fc01020bb921afe3607.zip
OSYSTEM: extended installTimerProc() with timer ID parameter
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/palette.cpp2
-rw-r--r--engines/sci/graphics/screen.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index c5a3545701..38919593b4 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -683,7 +683,7 @@ bool GfxPalette::palVaryLoadTargetPalette(GuiResourceId resourceId) {
void GfxPalette::palVaryInstallTimer() {
int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1;
// Call signal increase every [ticks]
- g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this);
+ g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this, "sciPalette");
}
void GfxPalette::palVaryRemoveTimer() {
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index dbe2135143..6469bc0cb3 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -20,9 +20,9 @@
*
*/
-#include "common/timer.h"
#include "common/util.h"
#include "common/system.h"
+#include "common/timer.h"
#include "graphics/surface.h"
#include "engines/util.h"