diff options
author | Lars Skovlund | 2011-01-21 18:53:35 +0000 |
---|---|---|
committer | Lars Skovlund | 2011-01-21 18:53:35 +0000 |
commit | 0e33dd91645bb26c51731cc79b2f142b3883047c (patch) | |
tree | fdb5609aaf095594a8a92660115c2369e51494d4 /engines/sci/engine | |
parent | e55ac4f419db480b1ce87087d7f063aa5297099f (diff) | |
download | scummvm-rg350-0e33dd91645bb26c51731cc79b2f142b3883047c.tar.gz scummvm-rg350-0e33dd91645bb26c51731cc79b2f142b3883047c.tar.bz2 scummvm-rg350-0e33dd91645bb26c51731cc79b2f142b3883047c.zip |
SCI: Partial robot support, currently disabled since it does not run
asynchronously as it should.
svn-id: r55382
Diffstat (limited to 'engines/sci/engine')
-rw-r--r-- | engines/sci/engine/kgraphics.cpp | 4 | ||||
-rw-r--r-- | engines/sci/engine/kmisc.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 184b56317f..855c6a25c0 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -1407,8 +1407,8 @@ reg_t kRobot(EngineState *s, int argc, reg_t *argv) { int16 x = argv[4].toUint16(); int16 y = argv[5].toUint16(); warning("kRobot(init), id %d, obj %04x:%04x, flag %d, x=%d, y=%d", id, PRINT_REG(obj), flag, x, y); - GfxRobot *test = new GfxRobot(g_sci->getResMan(), g_sci->_gfxScreen, id); - test->draw(); + GfxRobot *test = new GfxRobot(g_sci->getResMan(), g_sci->_gfxScreen, g_sci->_gfxPalette, id); + test->draw(x,y); delete test; } diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 60a2fea481..d4ca3286e2 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -32,6 +32,7 @@ #include "sci/engine/kernel.h" #include "sci/engine/gc.h" #include "sci/graphics/maciconbar.h" +#include "sci/console.h" namespace Sci { @@ -177,8 +178,7 @@ reg_t kFlushResources(EngineState *s, int argc, reg_t *argv) { reg_t kSetDebug(EngineState *s, int argc, reg_t *argv) { debug("Debug mode activated"); - g_sci->_debugState.seeking = kDebugSeekNothing; - g_sci->_debugState.runningStep = 0; + g_sci->getDebugger()->attach(); return s->r_acc; } |