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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sat Oct 17 21:46:27 CEST 2009


Revision: 45199
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45199&view=rev
Author:   m_kiewitz
Date:     2009-10-17 19:46:27 +0000 (Sat, 17 Oct 2009)

Log Message:
-----------
SCI/newgui: setup default transition, also dont setup transition if no transition-number was given by caller

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

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-17 18:59:13 UTC (rev 45198)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-17 19:46:27 UTC (rev 45199)
@@ -107,11 +107,17 @@
 		_translationTable = NULL;
 	else
 		_translationTable = oldTransitionIDs;
+
+	// setup default transition
+	_number = SCI_TRANSITIONS_HORIZONTALROLL_FROMCENTER;
+	_blackoutFlag = false;
 }
 
 void SciGuiTransitions::setup(int16 number, bool blackoutFlag) {
-	_number = number;
-	_blackoutFlag = blackoutFlag;
+	if (number != -1) {
+		_number = number;
+		_blackoutFlag = blackoutFlag;
+	}
 }
 
 // will translate a number and return corresponding translationEntry


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