diff options
author | Filippos Karapetis | 2009-09-04 15:40:15 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-09-04 15:40:15 +0000 |
commit | d398c17f79838b2edb14f1881aa43ab3c7135d17 (patch) | |
tree | feece0b4d52887a6cb52de671d7c8f90ace861c8 | |
parent | 32af5eb3bedd5c17cb73e59760f30278b0f03a8b (diff) | |
download | scummvm-rg350-d398c17f79838b2edb14f1881aa43ab3c7135d17.tar.gz scummvm-rg350-d398c17f79838b2edb14f1881aa43ab3c7135d17.tar.bz2 scummvm-rg350-d398c17f79838b2edb14f1881aa43ab3c7135d17.zip |
- Allow SCI games to set the cursor position when it's hidden once again
- Changed the message shown when the game tries to move the cursor off the screen bounds from a warning to a debug message, to avoid spam in games that do this behavior, e.g. the Camelot demo
svn-id: r43942
-rw-r--r-- | engines/sci/engine/kgraphics.cpp | 2 | ||||
-rw-r--r-- | engines/sci/gfx/operations.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 4287bf37a8..623789f296 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -300,7 +300,7 @@ static reg_t kSetCursorSci0(EngineState *s, int, int argc, reg_t *argv) { gfxop_set_pointer_cursor(s->gfx_state, cursor); // Set pointer position, if requested - if (argc >= 4 && cursor != GFXOP_NO_POINTER) { + if (argc >= 4) { Common::Point newPos = Common::Point(argv[2].toSint16() + s->port->_bounds.x, argv[3].toSint16() + s->port->_bounds.y); gfxop_set_pointer_position(s->gfx_state, newPos); } diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 8d15b51696..348f7d467f 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -1109,7 +1109,7 @@ void gfxop_set_pointer_position(GfxState *state, Common::Point pos) { state->pointer_pos = pos; if (pos.x > 320 || pos.y > 200) { - warning("[GFX] Attempt to place pointer at invalid coordinates (%d, %d)", pos.x, pos.y); + debugC("[GFX] Attempt to place pointer at invalid coordinates (%d, %d)\n", pos.x, pos.y); return; // Not fatal } |