[Scummvm-cvs-logs] SF.net SVN: scummvm:[45191] scummvm/trunk/engines/sci/gui/gui_transitions. cpp
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Sat Oct 17 17:37:16 CEST 2009
Revision: 45191
http://scummvm.svn.sourceforge.net/scummvm/?rev=45191&view=rev
Author: mthreepwood
Date: 2009-10-17 15:37:16 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
Silence gcc warnings.
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 15:28:15 UTC (rev 45190)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp 2009-10-17 15:37:16 UTC (rev 45191)
@@ -78,25 +78,25 @@
// this table defines the blackout-transition that needs to be done prior doing the actual transition
static const GuiTransitionTranslateEntry blackoutTransitionIDs[] = {
- { SCI_TRANSITIONS_VERTICALROLL_FROMCENTER, SCI_TRANSITIONS_VERTICALROLL_TOCENTER },
- { SCI_TRANSITIONS_HORIZONTALROLL_FROMCENTER, SCI_TRANSITIONS_HORIZONTALROLL_TOCENTER },
- { SCI_TRANSITIONS_STRAIGHT_FROM_RIGHT, SCI_TRANSITIONS_STRAIGHT_FROM_LEFT },
- { SCI_TRANSITIONS_STRAIGHT_FROM_LEFT, SCI_TRANSITIONS_STRAIGHT_FROM_RIGHT },
- { SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM, SCI_TRANSITIONS_STRAIGHT_FROM_TOP },
- { SCI_TRANSITIONS_STRAIGHT_FROM_TOP, SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM },
- { SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER, SCI_TRANSITIONS_DIAGONALROLL_TOCENTER },
- { SCI_TRANSITIONS_DIAGONALROLL_TOCENTER, SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER },
- { SCI_TRANSITIONS_BLOCKS, SCI_TRANSITIONS_BLOCKS },
- { SCI_TRANSITIONS_PIXELATION, SCI_TRANSITIONS_PIXELATION },
- { SCI_TRANSITIONS_FADEPALETTE, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_SCROLL_RIGHT, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_SCROLL_LEFT, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_SCROLL_UP, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_SCROLL_DOWN, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_NONE_LONGBOW, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_NONE, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_VERTICALROLL_TOCENTER, SCI_TRANSITIONS_NONE },
- { SCI_TRANSITIONS_HORIZONTALROLL_TOCENTER, SCI_TRANSITIONS_NONE }
+ { SCI_TRANSITIONS_VERTICALROLL_FROMCENTER, SCI_TRANSITIONS_VERTICALROLL_TOCENTER, true },
+ { SCI_TRANSITIONS_HORIZONTALROLL_FROMCENTER, SCI_TRANSITIONS_HORIZONTALROLL_TOCENTER, true },
+ { SCI_TRANSITIONS_STRAIGHT_FROM_RIGHT, SCI_TRANSITIONS_STRAIGHT_FROM_LEFT, true },
+ { SCI_TRANSITIONS_STRAIGHT_FROM_LEFT, SCI_TRANSITIONS_STRAIGHT_FROM_RIGHT, true },
+ { SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM, SCI_TRANSITIONS_STRAIGHT_FROM_TOP, true },
+ { SCI_TRANSITIONS_STRAIGHT_FROM_TOP, SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM, true },
+ { SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER, SCI_TRANSITIONS_DIAGONALROLL_TOCENTER, true },
+ { SCI_TRANSITIONS_DIAGONALROLL_TOCENTER, SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER, true },
+ { SCI_TRANSITIONS_BLOCKS, SCI_TRANSITIONS_BLOCKS, true },
+ { SCI_TRANSITIONS_PIXELATION, SCI_TRANSITIONS_PIXELATION, true },
+ { SCI_TRANSITIONS_FADEPALETTE, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_SCROLL_RIGHT, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_SCROLL_LEFT, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_SCROLL_UP, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_SCROLL_DOWN, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_NONE_LONGBOW, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_NONE, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_VERTICALROLL_TOCENTER, SCI_TRANSITIONS_NONE, true },
+ { SCI_TRANSITIONS_HORIZONTALROLL_TOCENTER, SCI_TRANSITIONS_NONE, true }
};
void SciGuiTransitions::init() {
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