diff options
author | Martin Kiewitz | 2010-02-05 16:03:14 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-02-05 16:03:14 +0000 |
commit | e7cffa90b2718398f93ce9e8ad331cd39e832c14 (patch) | |
tree | 8de5e8399abf3747762dca175e441ec4816a0870 /engines/sci/engine/kernel32.cpp | |
parent | 71519a0a8f2e209743ae79d2c513032b865a43f6 (diff) | |
download | scummvm-rg350-e7cffa90b2718398f93ce9e8ad331cd39e832c14.tar.gz scummvm-rg350-e7cffa90b2718398f93ce9e8ad331cd39e832c14.tar.bz2 scummvm-rg350-e7cffa90b2718398f93ce9e8ad331cd39e832c14.zip |
SCI: frameout sci32 stuff now gets called directly w/o SciGui/32
svn-id: r47907
Diffstat (limited to 'engines/sci/engine/kernel32.cpp')
-rw-r--r-- | engines/sci/engine/kernel32.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp index 06d1b8b044..06a24caffc 100644 --- a/engines/sci/engine/kernel32.cpp +++ b/engines/sci/engine/kernel32.cpp @@ -31,6 +31,7 @@ #include "sci/engine/selector.h" #include "sci/graphics/gui.h" #include "sci/graphics/gui32.h" +#include "sci/graphics/frameout.h" namespace Sci { @@ -669,7 +670,7 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv) { reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv) { reg_t viewObj = argv[0]; - s->_gui32->addScreenItem(viewObj); + s->_gfxFrameout->kernelAddScreenItem(viewObj); return NULL_REG; } @@ -683,7 +684,7 @@ reg_t kUpdateScreenItem(EngineState *s, int argc, reg_t *argv) { reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) { reg_t viewObj = argv[0]; - s->_gui32->deleteScreenItem(viewObj); + s->_gfxFrameout->kernelDeleteScreenItem(viewObj); /* reg_t viewObj = argv[0]; @@ -705,7 +706,7 @@ reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) { reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) { reg_t planeObj = argv[0]; - s->_gui32->addPlane(planeObj); + s->_gfxFrameout->kernelAddPlane(planeObj); warning("kAddPlane object %04x:%04x", PRINT_REG(planeObj)); return NULL_REG; } @@ -713,7 +714,7 @@ reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) { reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) { reg_t planeObj = argv[0]; - s->_gui32->deletePlane(planeObj); + s->_gfxFrameout->kernelDeletePlane(planeObj); warning("kDeletePlane object %04x:%04x", PRINT_REG(planeObj)); return NULL_REG; } @@ -721,7 +722,7 @@ reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) { reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv) { reg_t planeObj = argv[0]; - s->_gui32->updatePlane(planeObj); + s->_gfxFrameout->kernelUpdatePlane(planeObj); return s->r_acc; } @@ -735,8 +736,8 @@ reg_t kRepaintPlane(EngineState *s, int argc, reg_t *argv) { } reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv) { - warning("kGetHighPlanePri: %d", s->_gui32->getHighPlanePri()); - return make_reg(0, s->_gui32->getHighPlanePri()); + warning("kGetHighPlanePri: %d", s->_gfxFrameout->kernelGetHighPlanePri()); + return make_reg(0, s->_gfxFrameout->kernelGetHighPlanePri()); } reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) { @@ -744,7 +745,7 @@ reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) { // as its called right after a view is updated // TODO - s->_gui32->frameOut(); + s->_gfxFrameout->kernelFrameout(); return NULL_REG; } |