aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2009-12-26 18:07:36 +0000
committerMartin Kiewitz2009-12-26 18:07:36 +0000
commit78d268b21a65bcf4e7909f87374a08bec22c7ffe (patch)
treeaf485b2058d1c61552e4aca598ccf6a9b13c6c68
parent4950d0de78b270c4e1105f586dc6d06e1eef3e01 (diff)
downloadscummvm-rg350-78d268b21a65bcf4e7909f87374a08bec22c7ffe.tar.gz
scummvm-rg350-78d268b21a65bcf4e7909f87374a08bec22c7ffe.tar.bz2
scummvm-rg350-78d268b21a65bcf4e7909f87374a08bec22c7ffe.zip
SCI/newgui: Added support for draw_pic command
svn-id: r46599
-rw-r--r--engines/sci/console.cpp3
-rw-r--r--engines/sci/gui/gui.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index fecee33328..e705a828f6 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -1026,6 +1026,9 @@ bool Console::cmdDrawPic(int argc, const char **argv) {
gfxop_clear_box(_vm->_gamestate->gfx_state, gfx_rect(0, 0, 320, 200));
gfxop_update(_vm->_gamestate->gfx_state);
kernel_sleep(_vm->_gamestate->_event, 0);
+#else
+ _vm->_gamestate->_gui->drawPicture(atoi(argv[1]), 100, false, false, false, 0);
+ _vm->_gamestate->_gui->animateShowPic();
#endif
return false;
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index 0ec4d8ce23..4db3d931d2 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -121,6 +121,7 @@ public:
virtual void shakeScreen(uint16 shakeCount, uint16 directions);
virtual uint16 onControl(byte screenMask, Common::Rect rect);
+ virtual void animateShowPic();
virtual void animate(reg_t listReference, bool cycle, int argc, reg_t *argv);
virtual void addToPicList(reg_t listReference, int argc, reg_t *argv);
virtual void addToPicView(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, int16 leftPos, int16 topPos, int16 priority, int16 control);
@@ -163,7 +164,6 @@ protected:
private:
virtual void initPriorityBands();
- virtual void animateShowPic();
virtual void addToPicSetPicNotValid();
virtual int getControlPicNotValid();