From b421c9fde992191f61f324e9741875e3667a7a87 Mon Sep 17 00:00:00 2001 From: Robert Göffringmann Date: Mon, 30 Jun 2003 16:59:41 +0000 Subject: finally fixed this stupid animation bug svn-id: r8675 --- sky/screen.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sky/screen.cpp') 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) { -- cgit v1.2.3