aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Haisch2011-02-07 08:22:32 +0000
committerWillem Jan Palenstijn2011-11-20 22:43:10 +0100
commit581f0ba8b57458924a83d20eed55e577574cb1ac (patch)
treefe5521e7c5776744f58b7f6248f552a43af72f19
parent3f78e1c8d90ef9d1726ffeb1e80c16445eefd777 (diff)
downloadscummvm-rg350-581f0ba8b57458924a83d20eed55e577574cb1ac.tar.gz
scummvm-rg350-581f0ba8b57458924a83d20eed55e577574cb1ac.tar.bz2
scummvm-rg350-581f0ba8b57458924a83d20eed55e577574cb1ac.zip
TOLTECS: Use CursorMan instead of OSystem for showMouse
-rw-r--r--engines/toltecs/script.cpp6
-rw-r--r--engines/toltecs/toltecs.cpp2
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp
index 6ec285603d..fa5eb4d5d9 100644
--- a/engines/toltecs/script.cpp
+++ b/engines/toltecs/script.cpp
@@ -23,6 +23,8 @@
// TODO: Clean up game variable handling and move it to ToltecsEngine
+#include "graphics/cursorman.h"
+
#include "toltecs/toltecs.h"
#include "toltecs/animation.h"
#include "toltecs/menu.h"
@@ -608,7 +610,7 @@ void ScriptInterpreter::setGameVar(uint variable, int16 value) {
switch (variable) {
case 0:
_vm->_mouseDisabled = value;
- _vm->_system->showMouse(value == 0);
+ CursorMan.showMouse(value == 0);
break;
case 3:
_vm->_mouseButton = value;
@@ -1062,7 +1064,7 @@ void ScriptInterpreter::sfRunOptionsScreen() {
_vm->_palette->setDeltaPalette(_vm->_palette->getMainPalette(), 7, 0, 31, 224);
_vm->_screen->finishTalkTextItems();
_vm->_screen->clearSprites();
- _vm->_system->showMouse(true);
+ CursorMan.showMouse(true);
_vm->_menuSystem->run();
_vm->_keyState.reset();
_switchLocalDataNear = true;
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index a348456d22..12c7b53216 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -141,7 +141,7 @@ Common::Error ToltecsEngine::run() {
syncSoundSettings();
- _system->showMouse(true);
+ CursorMan.showMouse(true);
setupSysStrings();