aboutsummaryrefslogtreecommitdiff
path: root/sky/screen.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-06-30 16:59:41 +0000
committerRobert Göffringmann2003-06-30 16:59:41 +0000
commitb421c9fde992191f61f324e9741875e3667a7a87 (patch)
tree9f53ca3fa4ab9b44d480abb7720e1760ac020d03 /sky/screen.cpp
parent1f0c925c2b953c2832f478307ece40f9eb50058c (diff)
downloadscummvm-rg350-b421c9fde992191f61f324e9741875e3667a7a87.tar.gz
scummvm-rg350-b421c9fde992191f61f324e9741875e3667a7a87.tar.bz2
scummvm-rg350-b421c9fde992191f61f324e9741875e3667a7a87.zip
finally fixed this stupid animation bug
svn-id: r8675
Diffstat (limited to 'sky/screen.cpp')
-rw-r--r--sky/screen.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/sky/screen.cpp b/sky/screen.cpp
index 7b5b175617..324ed0500e 100644
--- a/sky/screen.cpp
+++ b/sky/screen.cpp
@@ -300,6 +300,12 @@ void SkyScreen::fnFadeUp(uint32 palNum, uint32 scroll) {
//_currentScreen points to new screen,
//_scrollScreen points to graphic showing old room
+ if (scroll == 13) scroll = 123; // script bug (?) in lower area
+ if ((scroll != 123) && (scroll != 321) && (scroll)) {
+ warning("unknown scroll parameter %d",scroll);
+ scroll = 0;
+ }
+
if ((scroll == 0) || (SkyState::_systemVars.systemFlags & SF_NO_SCROLL)) {
uint8 *palette = (uint8*)SkyState::fetchCompact(palNum);
if (palette == NULL)
@@ -350,7 +356,7 @@ void SkyScreen::fnFadeUp(uint32 palNum, uint32 scroll) {
}
showScreen(_currentScreen);
free(_scrollScreen);
- } else error("Unknown scroll parameter: %d\n",scroll);
+ }
}
void SkyScreen::waitForTimer(void) {