libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 02:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI/newgui: SciGuiTransitions now also supports scrolling down (e.g. lsl1 intro), cleanup

Browse Source 
svn-id: r45116
This commit is contained in:
Martin Kiewitz 2009-10-15 12:55:12 +00:00
parent f351295ebe
commit f1a981cb49
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engines/sci/gui/gui_transitions.cpp
View File

@ -48,7 +48,7 @@ SciGuiTransitions::~SciGuiTransitions() {
// This table contains a mapping between oldIDs (prior SCI1LATE) and newIDs
byte oldTransitionIDs[256][2] = {
{ 8, SCI_TRANSITIONS_BLOCKS },
{ 8, SCI_TRANSITIONS_BLOCKS },
{ 18, SCI_TRANSITIONS_PIXELATION },
{ 30, SCI_TRANSITIONS_FADEPALETTE },
{ 40, SCI_TRANSITIONS_SCROLLRIGHT },
@ -105,13 +105,10 @@ void SciGuiTransitions::doit(Common::Rect picRect) {
break;
case SCI_TRANSITIONS_SCROLLRIGHT:
setNewPalette(); scroll(SCI_TRANSITIONS_SCROLL_RIGHT);
break;
case SCI_TRANSITIONS_SCROLLLEFT:
setNewPalette(); scroll(SCI_TRANSITIONS_SCROLL_LEFT);
break;
case SCI_TRANSITIONS_SCROLLUP:
setNewPalette(); scroll(SCI_TRANSITIONS_SCROLL_UP);
case SCI_TRANSITIONS_SCROLLDOWN:
setNewPalette(); scroll();
break;
default:
@ -202,7 +199,7 @@ void SciGuiTransitions::blocks() {
}
// scroll old screen (up/down/left/right) and insert new screen that way - works on _picRect area
void SciGuiTransitions::scroll(int16 direction) {
void SciGuiTransitions::scroll() {
int16 screenWidth, screenHeight;
byte *oldScreenPtr;
int16 stepNr = 0;
@ -215,8 +212,8 @@ void SciGuiTransitions::scroll(int16 direction) {
oldScreenPtr = _oldScreen + _picRect.left + _picRect.top * screenWidth;
switch (direction) {
case SCI_TRANSITIONS_SCROLL_LEFT:
switch (_number) {
case SCI_TRANSITIONS_SCROLLLEFT:
newScreenRect.right = newScreenRect.left;
newMoveRect.left = newMoveRect.right;
while (oldMoveRect.left < oldMoveRect.right) {
@ -235,7 +232,7 @@ void SciGuiTransitions::scroll(int16 direction) {
g_system->updateScreen();
break;
case SCI_TRANSITIONS_SCROLL_RIGHT:
case SCI_TRANSITIONS_SCROLLRIGHT:
newScreenRect.left = newScreenRect.right;
while (oldMoveRect.left < oldMoveRect.right) {
oldMoveRect.left++;
@ -253,7 +250,7 @@ void SciGuiTransitions::scroll(int16 direction) {
g_system->updateScreen();
break;
case SCI_TRANSITIONS_SCROLL_UP:
case SCI_TRANSITIONS_SCROLLUP:
newScreenRect.bottom = newScreenRect.top;
newMoveRect.top = newMoveRect.bottom;
while (oldMoveRect.top < oldMoveRect.bottom) {
@ -266,6 +263,19 @@ void SciGuiTransitions::scroll(int16 direction) {
g_system->delayMillis(3);
}
break;
case SCI_TRANSITIONS_SCROLLDOWN:
newScreenRect.top = newScreenRect.bottom;
while (oldMoveRect.top < oldMoveRect.bottom) {
oldMoveRect.top++;
if (oldMoveRect.top < oldMoveRect.bottom)
g_system->copyRectToScreen(oldScreenPtr, screenWidth, oldMoveRect.left, oldMoveRect.top, oldMoveRect.width(), oldMoveRect.height());
newScreenRect.top--;
_screen->copyRectToScreen(newScreenRect, _picRect.left, _picRect.top);
g_system->updateScreen();
g_system->delayMillis(3);
}
break;
}
}

8
engines/sci/gui/gui_transitions.h
View File

@ -40,12 +40,6 @@ enum {
SCI_TRANSITIONS_SCROLLDOWN = 14
};
enum {
SCI_TRANSITIONS_SCROLL_RIGHT = 1,
SCI_TRANSITIONS_SCROLL_LEFT = 2,
SCI_TRANSITIONS_SCROLL_UP = 3
};
class SciGuiScreen;
class SciGuiTransitions {
public:
@ -63,7 +57,7 @@ private:
void fadeIn();
void pixelation();
void blocks();
void scroll(int16 direction);
void scroll();
SciGui *_gui;
SciGuiScreen *_screen;