diff options
| author | Matthew Hoops | 2009-10-17 15:37:16 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2009-10-17 15:37:16 +0000 |
| commit | d87d41802cd118ad5aee42481001cef4f2af22ec (patch) | |
| tree | b6a9369a1180def8018383185d6e263aa8f4c5df /engines | |
| parent | 0559d1e3ca0335a1a1be15805a1a41e3d252893f (diff) | |
| download | scummvm-rg350-d87d41802cd118ad5aee42481001cef4f2af22ec.tar.gz scummvm-rg350-d87d41802cd118ad5aee42481001cef4f2af22ec.tar.bz2 scummvm-rg350-d87d41802cd118ad5aee42481001cef4f2af22ec.zip | |
Silence gcc warnings.
svn-id: r45191
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/gui/gui_transitions.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp index ae294d02cc..be55ffe1a8 100644 --- a/engines/sci/gui/gui_transitions.cpp +++ b/engines/sci/gui/gui_transitions.cpp @@ -78,25 +78,25 @@ static const GuiTransitionTranslateEntry oldTransitionIDs[] = { // 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() { |