diff options
| author | Martin Kiewitz | 2009-10-17 19:46:27 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-17 19:46:27 +0000 |
| commit | b66d9895541926050b0107c45bc335c41d108810 (patch) | |
| tree | 79ef557a9e8d7dda7474a607368d4d8e92520582 | |
| parent | ed964efe3d4662fa50490c4ff0d75e889fcab5df (diff) | |
| download | scummvm-rg350-b66d9895541926050b0107c45bc335c41d108810.tar.gz scummvm-rg350-b66d9895541926050b0107c45bc335c41d108810.tar.bz2 scummvm-rg350-b66d9895541926050b0107c45bc335c41d108810.zip | |
SCI/newgui: setup default transition, also dont setup transition if no transition-number was given by caller
svn-id: r45199
| -rw-r--r-- | engines/sci/gui/gui_transitions.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp index 2b3f65ad43..0dd7b56390 100644 --- a/engines/sci/gui/gui_transitions.cpp +++ b/engines/sci/gui/gui_transitions.cpp @@ -107,11 +107,17 @@ void SciGuiTransitions::init() { _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 |