25
25
26
26
#include " common/events.h"
27
27
#include " common/system.h"
28
+ #include " graphics/cursorman.h"
28
29
29
30
#include " parallaction/exec.h"
30
31
#include " parallaction/input.h"
@@ -444,11 +445,11 @@ void Input::setMouseState(MouseTriState state) {
444
445
switch (_mouseState) {
445
446
case MOUSE_ENABLED_HIDE:
446
447
case MOUSE_DISABLED:
447
- _vm-> _system -> showMouse (false );
448
+ CursorMan. showMouse (false );
448
449
break ;
449
450
450
451
case MOUSE_ENABLED_SHOW:
451
- _vm-> _system -> showMouse (true );
452
+ CursorMan. showMouse (true );
452
453
break ;
453
454
}
454
455
}
@@ -519,14 +520,14 @@ void Input::setArrowCursor() {
519
520
// this stuff is needed to avoid artifacts with labels and selected items when switching cursors
520
521
stopHovering ();
521
522
_activeItem._id = 0 ;
522
- _vm-> _system -> setMouseCursor (_mouseArrow->getData (0 ), MOUSEARROW_WIDTH_NS, MOUSEARROW_HEIGHT_NS, 0 , 0 , 0 );
523
+ CursorMan. replaceCursor (_mouseArrow->getData (0 ), MOUSEARROW_WIDTH_NS, MOUSEARROW_HEIGHT_NS, 0 , 0 , 0 );
523
524
break ;
524
525
525
526
case GType_BRA: {
526
527
Common::Rect r;
527
528
_mouseArrow->getRect (0 , r);
528
- _vm-> _system -> setMouseCursor (_mouseArrow->getData (0 ), r.width (), r.height (), 0 , 0 , 0 );
529
- _vm-> _system -> showMouse (true );
529
+ CursorMan. replaceCursor (_mouseArrow->getData (0 ), r.width (), r.height (), 0 , 0 , 0 );
530
+ CursorMan. showMouse (true );
530
531
_activeItem._id = 0 ;
531
532
break ;
532
533
}
@@ -545,7 +546,7 @@ void Input::setInventoryCursor(ItemName name) {
545
546
byte *v8 = _comboArrow->getData (0 );
546
547
// FIXME: destination offseting is not clear
547
548
_vm->_inventoryRenderer ->drawItem (name, v8 + 7 * MOUSECOMBO_WIDTH_NS + 7 , MOUSECOMBO_WIDTH_NS);
548
- _vm-> _system -> setMouseCursor (v8, MOUSECOMBO_WIDTH_NS, MOUSECOMBO_HEIGHT_NS, 0 , 0 , 0 );
549
+ CursorMan. replaceCursor (v8, MOUSECOMBO_WIDTH_NS, MOUSECOMBO_HEIGHT_NS, 0 , 0 , 0 );
549
550
break ;
550
551
}
551
552
@@ -555,7 +556,7 @@ void Input::setInventoryCursor(ItemName name) {
555
556
memcpy (dst, src, _comboArrow->getSize (0 ));
556
557
// FIXME: destination offseting is not clear
557
558
_vm->_inventoryRenderer ->drawItem (name, dst + _mouseComboProps_BR._yOffset * _mouseComboProps_BR._width + _mouseComboProps_BR._xOffset , _mouseComboProps_BR._width );
558
- _vm-> _system -> setMouseCursor (dst, _mouseComboProps_BR._width , _mouseComboProps_BR._height , 0 , 0 , 0 );
559
+ CursorMan. replaceCursor (dst, _mouseComboProps_BR._width , _mouseComboProps_BR._height , 0 , 0 , 0 );
559
560
break ;
560
561
}
561
562
0 commit comments