diff options
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_driver.cpp | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 2856c76aa3..c2777d9b0e 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "common/events.h" +#include "graphics/cursorman.h" #include "sci/sci.h" #include "sci/debug.h" // for g_debug_sleeptime_factor @@ -306,14 +307,14 @@ reg_t kSetCursor(EngineState *s, int funct_nr, int argc, reg_t *argv) { if (s->_version < SCI_VERSION_1_1) { if (argv[0].toSint16() <= 1) { // Newer (SCI1.1) semantics: show/hide cursor - g_system->showMouse(argv[0].toSint16() != 0); + CursorMan.showMouse(argv[0].toSint16() != 0); } else { // Pre-SCI1.1: set cursor according to the first parameter GFX_ASSERT(gfxop_set_pointer_cursor(s->gfx_state, argv[0].toSint16())); } } else { // SCI1.1: Show/hide cursor - g_system->showMouse(argv[0].toSint16() != 0); + CursorMan.showMouse(argv[0].toSint16() != 0); } break; case 2 : diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp index 961eecc6fd..3420472943 100644 --- a/engines/sci/gfx/gfx_driver.cpp +++ b/engines/sci/gfx/gfx_driver.cpp @@ -25,6 +25,7 @@ #include "common/scummsys.h" #include "common/system.h" +#include "graphics/cursorman.h" #include "graphics/primitives.h" #include "sci/sci.h" @@ -252,7 +253,7 @@ byte *GfxDriver::createCursor(gfx_pixmap_t *pointer) { int GfxDriver::setPointer(gfx_pixmap_t *pointer, Common::Point *hotspot) { if ((pointer == NULL) || (hotspot == NULL)) { - g_system->showMouse(false); + CursorMan.showMouse(false); } else { byte *cursorData = createCursor(pointer); @@ -266,8 +267,8 @@ int GfxDriver::setPointer(gfx_pixmap_t *pointer, Common::Point *hotspot) { if (!pointer->palette) color_key = 63; - g_system->setMouseCursor(cursorData, pointer->width, pointer->height, hotspot->x, hotspot->y, color_key); - g_system->showMouse(true); + CursorMan.replaceCursor(cursorData, pointer->width, pointer->height, hotspot->x, hotspot->y, color_key); + CursorMan.showMouse(true); delete[] cursorData; cursorData = 0; |