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

[m_kiewitz at users.sourceforge.net]

Revision: 45068
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45068&view=rev
Author:   m_kiewitz
Date:     2009-10-14 11:23:46 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiTransitions now gets picRect

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

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-14 11:18:13 UTC (rev 45067)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-14 11:23:46 UTC (rev 45068)
@@ -504,13 +504,20 @@
 	return result;
 }
 
+void SciGui::animateShowPic() {
+	GuiPort *oldPort = _gfx->SetPort((GuiPort *)_windowMgr->_picWind);
+
+	_transitions->doit(_gfx->GetPort()->rect);
+	_gfx->SetPort(oldPort);	
+}
+
 void SciGui::animate(reg_t listReference, bool cycle, int argc, reg_t *argv) {
 	byte old_picNotValid = _screen->_picNotValid;
 
 	if (listReference.isNull()) {
 		_animate->disposeLastCast();
 		if (_screen->_picNotValid)
-			_transitions->doit();
+			animateShowPic();
 		return;
 	}
 
@@ -536,7 +543,7 @@
 	_animate->drawCels();
 
 	if (_screen->_picNotValid)
-		_transitions->doit();
+		animateShowPic();
 
 	_animate->updateScreen(old_picNotValid);
 	_animate->restoreAndDelete(argc, argv);

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-14 11:18:13 UTC (rev 45067)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-14 11:23:46 UTC (rev 45068)
@@ -138,6 +138,7 @@
 
 private:
 	virtual void initPriorityBands();
+	virtual void animateShowPic();
 
 	SciGuiGfx *_gfx;
 	SciGuiresources *_resources;

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-14 11:18:13 UTC (rev 45067)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-14 11:23:46 UTC (rev 45068)
@@ -51,7 +51,7 @@
 	_number = number;
 }
 
-void SciGuiTransitions::doit() {
+void SciGuiTransitions::doit(Common::Rect picRect) {
 	// TODO: Implement animations
 	warning("SciGuiTransitions: animation %d not implemented", _number);
 	_palette->setOnScreen();

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.h	2009-10-14 11:18:13 UTC (rev 45067)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.h	2009-10-14 11:23:46 UTC (rev 45068)
@@ -37,7 +37,7 @@
 	~SciGuiTransitions();
 
 	void setup(int16 number);
-	void doit();
+	void doit(Common::Rect picRect);
 
 private:
 	void init(void);


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