diff options
| author | Martin Kiewitz | 2010-01-31 15:07:36 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-31 15:07:36 +0000 |
| commit | c991a5bcebd9c46070e41361855969bed9754e57 (patch) | |
| tree | 98d6fb4b0647d2198267946b325b1e018bda1539 /engines/sci/engine | |
| parent | 6248362c38b97c40f0a71544381397657a2b041f (diff) | |
| download | scummvm-rg350-c991a5bcebd9c46070e41361855969bed9754e57.tar.gz scummvm-rg350-c991a5bcebd9c46070e41361855969bed9754e57.tar.bz2 scummvm-rg350-c991a5bcebd9c46070e41361855969bed9754e57.zip | |
SCI: renamed SciGuiAnimate to GfxAnimate, moved code from SciGui into this class, now getting called directly
svn-id: r47751
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 782072a229..3b99a9b870 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -973,7 +973,7 @@ reg_t kAddToPic(EngineState *s, int argc, reg_t *argv) { case 1: if (argv[0].isNull()) return s->r_acc; - s->_gui->addToPicList(argv[0], argc, argv); + s->_gfxAnimate->kernelAddToPicList(argv[0], argc, argv); break; case 7: viewId = argv[0].toUint16(); @@ -983,7 +983,7 @@ reg_t kAddToPic(EngineState *s, int argc, reg_t *argv) { topPos = argv[4].toSint16(); priority = argv[5].toSint16(); control = argv[6].toSint16(); - s->_gui->addToPicView(viewId, loopNo, celNo, leftPos, topPos, priority, control); + s->_gfxAnimate->kernelAddToPicView(viewId, loopNo, celNo, leftPos, topPos, priority, control); break; default: error("kAddToPic with unsupported parameter count %d", argc); @@ -1102,7 +1102,7 @@ reg_t kAnimate(EngineState *s, int argc, reg_t *argv) { // Take care of incoming events (kAnimate is called semi-regularly) process_sound_events(s); #endif - s->_gui->animate(castListReference, cycle, argc, argv); + s->_gfxAnimate->kernelAnimate(castListReference, cycle, argc, argv); return s->r_acc; } diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index 31c46c4447..ad70669f7f 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -51,7 +51,9 @@ namespace Sci { class SciEvent; class Menubar; +class GfxAnimate; class GfxPorts; +class Screen; class SciGui; class Cursor; class MessageState; @@ -148,7 +150,9 @@ public: /* Non-VM information */ - GfxPorts *_gfxPorts; // Port managment for 16-bit gui + GfxAnimate *_gfxAnimate; // Animate for 16-bit gfx + GfxPorts *_gfxPorts; // Port managment for 16-bit gfx + Screen *_screen; // gfx screen SciGui *_gui; /* Currently active Gui */ #ifdef ENABLE_SCI32 |