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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sun Oct 25 20:04:38 CET 2009


Revision: 45373
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45373&view=rev
Author:   m_kiewitz
Date:     2009-10-25 19:04:36 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
SCI/newgui: kAddToPic - behaviour is different between SCI1EARLY and SCI1MIDDLE (fixes graphic glitch in qfg2 intro)

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

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-25 18:43:23 UTC (rev 45372)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-25 19:04:36 UTC (rev 45373)
@@ -563,6 +563,13 @@
 	_gfx->SetPort(oldPort);
 }
 
+void SciGui::addToPicSetPicNotValid() {
+	if (getSciVersion() <= SCI_VERSION_1_EARLY)
+		_screen->_picNotValid = 1;
+	else
+		_screen->_picNotValid = 2;
+}
+
 void SciGui::addToPicList(reg_t listReference, int argc, reg_t *argv) {
 	List *list;
 
@@ -575,12 +582,13 @@
 	_animate->makeSortedList(list);
 	_animate->addToPicDrawCels();
 
-	_screen->_picNotValid = 2;
+	addToPicSetPicNotValid();
 }
 
 void SciGui::addToPicView(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, int16 leftPos, int16 topPos, int16 priority, int16 control) {
 	_gfx->SetPort((GuiPort *)_windowMgr->_picWind);
 	_animate->addToPicDrawView(viewId, loopNo, celNo, leftPos, topPos, priority, control);
+	addToPicSetPicNotValid();
 }
 
 void SciGui::setNowSeen(reg_t objectReference) {

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-25 18:43:23 UTC (rev 45372)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-25 19:04:36 UTC (rev 45373)
@@ -143,6 +143,7 @@
 private:
 	virtual void initPriorityBands();
 	virtual void animateShowPic();
+	virtual void addToPicSetPicNotValid();
 
 	SciGuiGfx *_gfx;
 	SciGuiresources *_resources;


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




More information about the Scummvm-git-logs mailing list