diff options
| -rw-r--r-- | engines/lab/lab.cpp | 17 | ||||
| -rw-r--r-- | engines/lab/module.mk | 4 | ||||
| -rw-r--r-- | engines/lab/vga.cpp | 28 |
3 files changed, 18 insertions, 31 deletions
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp index 1e15845201..6781a8acc0 100644 --- a/engines/lab/lab.cpp +++ b/engines/lab/lab.cpp @@ -183,4 +183,21 @@ void LabEngine::drawStaticMessage(byte index) { _graphics->drawMessage(_resource->getStaticText((StaticText)index).c_str()); } +void LabEngine::changeVolume(int delta) { + warning("STUB: changeVolume()"); +} + +void LabEngine::waitTOF() { + g_system->copyRectToScreen(_graphics->_displayBuffer, _graphics->_screenWidth, 0, 0, _graphics->_screenWidth, _graphics->_screenHeight); + g_system->updateScreen(); + + _event->processInput(); + + uint32 now; + + for (now = g_system->getMillis(); now - _lastWaitTOFTicks <= 0xF; now = g_system->getMillis() ) + g_system->delayMillis(_lastWaitTOFTicks - now + 17); + + _lastWaitTOFTicks = now; +} } // End of namespace Lab diff --git a/engines/lab/module.mk b/engines/lab/module.mk index 434ba7d97a..3985b1415f 100644 --- a/engines/lab/module.mk +++ b/engines/lab/module.mk @@ -19,9 +19,7 @@ MODULE_OBJS := \ special.o \ text.o \ tilepuzzle.o \ - timing.o \ - vga.o - + timing.o # This module can be built as a plugin ifeq ($(ENABLE_LAB), DYNAMIC_PLUGIN) diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp index 95099dc0b7..b80f338c1e 100644 --- a/engines/lab/vga.cpp +++ b/engines/lab/vga.cpp @@ -28,34 +28,6 @@ * */ -#include "graphics/palette.h" -#include "common/events.h" - -#include "lab/lab.h" -#include "lab/image.h" - namespace Lab { -/*****************************************************************************/ -/* Sets the current page on the VGA card. */ -/*****************************************************************************/ -void LabEngine::changeVolume(int delta) { - warning("STUB: changeVolume()"); -} - - -void LabEngine::waitTOF() { - g_system->copyRectToScreen(_graphics->_displayBuffer, _graphics->_screenWidth, 0, 0, _graphics->_screenWidth, _graphics->_screenHeight); - g_system->updateScreen(); - - _event->processInput(); - - uint32 now; - - for (now = g_system->getMillis(); now - _lastWaitTOFTicks <= 0xF; now = g_system->getMillis() ) - g_system->delayMillis(_lastWaitTOFTicks - now + 17); - - _lastWaitTOFTicks = now; -} - } // End of namespace Lab |