diff options
| author | Johannes Schickel | 2008-06-24 13:59:48 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-06-24 13:59:48 +0000 |
| commit | df1aa7809aad2a6b0404d57aeb9d0c5a423fd91b (patch) | |
| tree | af5fb1d2792f23547699042416abb0c428df63f7 /engines/kyra/gui_lok.cpp | |
| parent | 28e32bb7cb6df6610e137500c0187d4ba36d8bdf (diff) | |
| download | scummvm-rg350-df1aa7809aad2a6b0404d57aeb9d0c5a423fd91b.tar.gz scummvm-rg350-df1aa7809aad2a6b0404d57aeb9d0c5a423fd91b.tar.bz2 scummvm-rg350-df1aa7809aad2a6b0404d57aeb9d0c5a423fd91b.zip | |
Added const to some static data.
svn-id: r32763
Diffstat (limited to 'engines/kyra/gui_lok.cpp')
| -rw-r--r-- | engines/kyra/gui_lok.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index 6fa30c9e9a..35b343fc25 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -188,6 +188,7 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) { #pragma mark - GUI_LoK::GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen) : GUI(vm), _vm(vm), _screen(screen) { + _lastScreenUpdate = 0; _menu = 0; initStaticResource(); _scrollUpFunctor = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::scrollUp); @@ -479,7 +480,6 @@ int GUI_LoK::buttonMenuCallback(Button *caller) { void GUI_LoK::getInput() { Common::Event event; - static uint32 lastScreenUpdate = 0; uint32 now = _vm->_system->getMillis(); _mouseWheel = 0; @@ -496,7 +496,7 @@ void GUI_LoK::getInput() { break; case Common::EVENT_MOUSEMOVE: _vm->_system->updateScreen(); - lastScreenUpdate = now; + _lastScreenUpdate = now; break; case Common::EVENT_WHEELUP: _mouseWheel = -1; @@ -512,9 +512,9 @@ void GUI_LoK::getInput() { } } - if (now - lastScreenUpdate > 50) { + if (now - _lastScreenUpdate > 50) { _vm->_system->updateScreen(); - lastScreenUpdate = now; + _lastScreenUpdate = now; } _vm->_system->delayMillis(3); @@ -1056,7 +1056,7 @@ void GUI_LoK::fadePalette() { if (_vm->gameFlags().platform == Common::kPlatformAmiga) return; - static int16 menuPalIndexes[] = {248, 249, 250, 251, 252, 253, 254, -1}; + static const int16 menuPalIndexes[] = {248, 249, 250, 251, 252, 253, 254, -1}; int index = 0; memcpy(_screen->getPalette(2), _screen->_currentPalette, 768); |