zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-13 14:55:52 +00:00
parent b8fa79c2d7
commit 61ff3307d1
2 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/gfx/fader.cpp
View file

@ -71,10 +71,9 @@ void CFader::render()
switch(s_fadeMode) switch(s_fadeMode)
{ {
case FADED_IN: case FADED_IN:
case PAUSE_BEFORE_FADING_IN:
case PAUSE_BEFORE_FADING_OUT:
return; return;
case PAUSE_BEFORE_FADING_IN:
case FADING_IN: case FADING_IN:
{ {
switch(s_fadeStyle) switch(s_fadeStyle)
@ -164,12 +163,6 @@ void CFader::render()
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFader::think(int _frames) void CFader::think(int _frames)
{ {
if(s_waitFrames)
{
s_waitFrames--;
return;
}
switch(s_fadeMode) switch(s_fadeMode)
{ {
case FADING_IN: case FADING_IN:
@ -185,9 +178,9 @@ void CFader::think(int _frames)
s_fadeValue=0; s_fadeValue=0;
if(s_fadeMode==FADING_OUT) if(s_fadeMode==FADING_OUT)
{ {
s_fadeMode=FADED_OUT;
CSoundMediator::setVolume(CSoundMediator::VOL_FADE,0);
s_waitFrames=FRAMES_TO_WAIT; s_waitFrames=FRAMES_TO_WAIT;
s_fadeMode=PAUSE_AFTER_FADING_OUT;
CSoundMediator::setVolume(CSoundMediator::VOL_FADE,0);
} }
else else
{ {
@ -207,21 +200,14 @@ void CFader::think(int _frames)
case PAUSE_BEFORE_FADING_IN: case PAUSE_BEFORE_FADING_IN:
if(--s_waitFrames==0) if(--s_waitFrames==0)
{ {
s_fadeMode==FADING_IN; s_fadeMode=FADING_IN;
}
break;
case PAUSE_BEFORE_FADING_OUT:
if(--s_waitFrames==0)
{
s_fadeMode==FADING_OUT;
} }
break; break;
case PAUSE_AFTER_FADING_OUT: case PAUSE_AFTER_FADING_OUT:
if(--s_waitFrames==0) if(--s_waitFrames==0)
{ {
s_fadeMode==FADED_OUT; s_fadeMode=FADED_OUT;
} }
break; break;
@ -247,6 +233,7 @@ void CFader::setFadingOut(FADE_STYLE _style)
break; break;
} }
s_fadeMode=FADING_OUT; s_fadeMode=FADING_OUT;
s_fadeStyle=_style; s_fadeStyle=_style;
s_waitFrames=FRAMES_TO_WAIT; s_waitFrames=FRAMES_TO_WAIT;
@ -268,8 +255,8 @@ void CFader::setFadingIn(FADE_STYLE _style)
s_fadeValue=255; s_fadeValue=255;
break; break;
} }
s_fadeMode=FADING_IN;
s_fadeStyle=_style; s_fadeStyle=_style;
s_fadeMode=PAUSE_BEFORE_FADING_IN;
s_waitFrames=FRAMES_TO_WAIT; s_waitFrames=FRAMES_TO_WAIT;
} }
@ -282,7 +269,7 @@ void CFader::setFadingIn(FADE_STYLE _style)
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
int CFader::isFading() int CFader::isFading()
{ {
return s_fadeMode==FADING_IN||s_fadeMode==FADING_OUT; return s_fadeMode!=FADED_IN&&s_fadeMode!=FADED_OUT;
} }

4
source/gfx/fader.h
View file

@ -56,10 +56,10 @@ private:
typedef enum typedef enum
{ {
FADED_IN,
PAUSE_BEFORE_FADING_IN, PAUSE_BEFORE_FADING_IN,
FADING_IN, FADING_IN,
PAUSE_BEFORE_FADING_OUT, FADED_IN,
FADING_OUT, FADING_OUT,
PAUSE_AFTER_FADING_OUT, PAUSE_AFTER_FADING_OUT,
FADED_OUT, FADED_OUT,