diff options
| author | Filippos Karapetis | 2009-10-13 16:22:07 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-13 16:22:07 +0000 |
| commit | 5aa141539786c4f905addfd0c05f6e00dfd3afd7 (patch) | |
| tree | ee34240f79b851cf67ece18fab3efd69c383c0a8 /engines/sci/gui32 | |
| parent | 7cefc4cc989ba7606e6473db9a56c14e30326c24 (diff) | |
| download | scummvm-rg350-5aa141539786c4f905addfd0c05f6e00dfd3afd7.tar.gz scummvm-rg350-5aa141539786c4f905addfd0c05f6e00dfd3afd7.tar.bz2 scummvm-rg350-5aa141539786c4f905addfd0c05f6e00dfd3afd7.zip | |
Merged the cursor manipulation code - cursor views are still not done
svn-id: r45028
Diffstat (limited to 'engines/sci/gui32')
| -rw-r--r-- | engines/sci/gui32/gui32.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp index 84a67365bb..f147c89dff 100644 --- a/engines/sci/gui32/gui32.cpp +++ b/engines/sci/gui32/gui32.cpp @@ -37,6 +37,7 @@ #include "sci/gfx/gfx_widgets.h" #include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual #include "sci/gui32/gui32.h" +#include "sci/gui/gui_cursor.h" // This is the real width of a text with a specified width of 0 #define MAX_TEXT_WIDTH_MAGIC_VALUE 192 @@ -67,6 +68,7 @@ namespace Sci { SciGui32::SciGui32( EngineState *state, SciGuiScreen *screen, SciGuiPalette *palette, SciGuiCursor *cursor) : s(state) { + _cursor = cursor; } SciGui32::~SciGui32() { @@ -2444,18 +2446,15 @@ bool SciGui32::canBeHere(reg_t curObject, reg_t listReference) { } void SciGui32::hideCursor() { - CursorMan.showMouse(false); + _cursor->hide(); } void SciGui32::showCursor() { - CursorMan.showMouse(true); + _cursor->show(); } void SciGui32::setCursorShape(GuiResourceId cursorId) { - if (cursorId == -1) - gfxop_set_pointer_cursor(s->gfx_state, GFXOP_NO_POINTER); - else - gfxop_set_pointer_cursor(s->gfx_state, cursorId); + _cursor->setShape(cursorId); } void SciGui32::setCursorPos(Common::Point pos) { |