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

[m_kiewitz at users.sourceforge.net]

Revision: 45136
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45136&view=rev
Author:   m_kiewitz
Date:     2009-10-15 22:09:15 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
SCI/newgui: transition 100 (no transition at all) now also supported

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

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-15 22:05:52 UTC (rev 45135)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-15 22:09:15 UTC (rev 45136)
@@ -48,18 +48,19 @@
 
 // This table contains a mapping between oldIDs (prior SCI1LATE) and newIDs
 static const GuiTransitionTranslateEntry oldTransitionIDs[] = {
-	{  1, SCI_TRANSITIONS_HORIZONTALROLLFROMCENTER,	false },
-	{  8, SCI_TRANSITIONS_BLOCKS,					false },
-	{ 10, SCI_TRANSITIONS_HORIZONTALROLLTOCENTER,	false },
-	{ 17, SCI_TRANSITIONS_BLOCKS,					true },
-	{ 18, SCI_TRANSITIONS_PIXELATION,				false },
-	{ 27, SCI_TRANSITIONS_PIXELATION,				true },
-	{ 30, SCI_TRANSITIONS_FADEPALETTE,				false },
-	{ 40, SCI_TRANSITIONS_SCROLLRIGHT,				false },
-	{ 41, SCI_TRANSITIONS_SCROLLLEFT,				false },
-	{ 42, SCI_TRANSITIONS_SCROLLUP,					false },
-	{ 43, SCI_TRANSITIONS_SCROLLDOWN,				false },
-	{ 255, 255,										false }
+	{   1, SCI_TRANSITIONS_HORIZONTALROLLFROMCENTER,	false },
+	{   8, SCI_TRANSITIONS_BLOCKS,						false },
+	{  10, SCI_TRANSITIONS_HORIZONTALROLLTOCENTER,		false },
+	{  17, SCI_TRANSITIONS_BLOCKS,						true },
+	{  18, SCI_TRANSITIONS_PIXELATION,					false },
+	{  27, SCI_TRANSITIONS_PIXELATION	,				true },
+	{  30, SCI_TRANSITIONS_FADEPALETTE,					false },
+	{  40, SCI_TRANSITIONS_SCROLLRIGHT,					false },
+	{  41, SCI_TRANSITIONS_SCROLLLEFT,					false },
+	{  42, SCI_TRANSITIONS_SCROLLUP,					false },
+	{  43, SCI_TRANSITIONS_SCROLLDOWN,					false },
+	{ 100, SCI_TRANSITIONS_NONE,						false },
+	{ 255, 255,											false }
 };
 
 void SciGuiTransitions::init() {
@@ -129,6 +130,9 @@
 		setNewPalette(); scroll();
 		break;
 
+	case SCI_TRANSITIONS_NONE:
+		setNewPalette(); setNewScreen();
+		break;
 	default:
 		warning("SciGuiTransitions: ID %d not implemented", _number);
 		setNewPalette(); setNewScreen();

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.h	2009-10-15 22:05:52 UTC (rev 45135)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.h	2009-10-15 22:09:15 UTC (rev 45136)
@@ -45,6 +45,7 @@
 	SCI_TRANSITIONS_SCROLLLEFT					= 12,
 	SCI_TRANSITIONS_SCROLLUP					= 13,
 	SCI_TRANSITIONS_SCROLLDOWN					= 14,
+	SCI_TRANSITIONS_NONE						= 100,
 	// here are transitions that are used by the old tableset, but are not included anymore in the new tableset
 	SCI_TRANSITIONS_HORIZONTALROLLTOCENTER		= 300
 };


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