diff options
| author | Martin Kiewitz | 2009-10-15 22:09:15 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-15 22:09:15 +0000 |
| commit | 71d4d12a82bb52cacb2728fb2f9d8837c1549436 (patch) | |
| tree | 4fd6b1f468e09718eb94494d0ed068417b7e1734 /engines | |
| parent | 6edf387418d49089bc2bc12e67261cc547774e87 (diff) | |
| download | scummvm-rg350-71d4d12a82bb52cacb2728fb2f9d8837c1549436.tar.gz scummvm-rg350-71d4d12a82bb52cacb2728fb2f9d8837c1549436.tar.bz2 scummvm-rg350-71d4d12a82bb52cacb2728fb2f9d8837c1549436.zip | |
SCI/newgui: transition 100 (no transition at all) now also supported
svn-id: r45136
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/gui/gui_transitions.cpp | 28 | ||||
| -rw-r--r-- | engines/sci/gui/gui_transitions.h | 1 |
2 files changed, 17 insertions, 12 deletions
diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp index 67d4e1be40..aabb838a61 100644 --- a/engines/sci/gui/gui_transitions.cpp +++ b/engines/sci/gui/gui_transitions.cpp @@ -48,18 +48,19 @@ SciGuiTransitions::~SciGuiTransitions() { // 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 @@ void SciGuiTransitions::doit(Common::Rect picRect) { setNewPalette(); scroll(); break; + case SCI_TRANSITIONS_NONE: + setNewPalette(); setNewScreen(); + break; default: warning("SciGuiTransitions: ID %d not implemented", _number); setNewPalette(); setNewScreen(); diff --git a/engines/sci/gui/gui_transitions.h b/engines/sci/gui/gui_transitions.h index bc988e0a0f..411d94b5ea 100644 --- a/engines/sci/gui/gui_transitions.h +++ b/engines/sci/gui/gui_transitions.h @@ -45,6 +45,7 @@ enum { 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 }; |