aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-03 21:52:21 +0000
committerFilippos Karapetis2010-06-03 21:52:21 +0000
commit576306c323d092b590e184ececb70745633aae4e (patch)
tree19b17e57ad2fdee1c6ae8ebfe9cc808b70fcec0c /engines/sci
parent038ac90482863d60567e64c11ed138d79000fe28 (diff)
downloadscummvm-rg350-576306c323d092b590e184ececb70745633aae4e.tar.gz
scummvm-rg350-576306c323d092b590e184ececb70745633aae4e.tar.bz2
scummvm-rg350-576306c323d092b590e184ececb70745633aae4e.zip
Re-enabled the cursor position limiting code
svn-id: r49413
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/kevent.cpp2
-rw-r--r--engines/sci/event.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 35f71efedd..3e096074e6 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -49,6 +49,8 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
SegManager *segMan = s->_segMan;
Common::Point mousePos;
+ // Limit the mouse cursor position, if necessary
+ g_sci->_gfxCursor->refreshPosition();
mousePos = g_sci->_gfxCursor->getPosition();
// If there's a simkey pending, and the game wants a keyboard event, use the
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 53f4675f56..c3be22b143 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -319,8 +319,6 @@ sciEvent SciEvent::get(unsigned int mask) {
//sci_event_t error_event = { SCI_EVT_ERROR, 0, 0, 0 };
sciEvent event = { 0, 0, 0, 0 };
- // TODO: we need to call Cursor::refreshPosition() before each screen update to limit the mouse cursor position
-
// Update the screen here, since it's called very often
g_system->updateScreen();
@@ -389,7 +387,6 @@ void SciEvent::sleep(uint32 msecs) {
while (true) {
// let backend process events and update the screen
get(SCI_EVENT_PEEK);
- // TODO: we need to call Cursor::refreshPosition() before each screen update to limit the mouse cursor position
time = g_system->getMillis();
if (time + 10 < wakeup_time) {
g_system->delayMillis(10);