[Scummvm-cvs-logs] SF.net SVN: scummvm:[46599] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 46599
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46599&view=rev
Author:   m_kiewitz
Date:     2009-12-26 18:07:36 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
SCI/newgui: Added support for draw_pic command

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/gui/gui.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2009-12-26 17:46:22 UTC (rev 46598)
+++ scummvm/trunk/engines/sci/console.cpp	2009-12-26 18:07:36 UTC (rev 46599)
@@ -1026,6 +1026,9 @@
 	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;

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-12-26 17:46:22 UTC (rev 46598)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-12-26 18:07:36 UTC (rev 46599)
@@ -121,6 +121,7 @@
 	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 @@
 
 private:
 	virtual void initPriorityBands();
-	virtual void animateShowPic();
 	virtual void addToPicSetPicNotValid();
 	virtual int getControlPicNotValid();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.