fix various graphical glitches

This commit is contained in:
Chris Danford
2003-04-15 18:32:34 +00:00
parent 4f43c7a91d
commit 228c9ba96b
3 changed files with 9 additions and 8 deletions
+7 -7
View File
@@ -648,19 +648,19 @@ ScoreP2ExtraOffCommand=linear,1;addy,-100
PlayerOptionsP1X=320 PlayerOptionsP1X=320
PlayerOptionsP1Y=434 PlayerOptionsP1Y=434
PlayerOptionsP1OnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100 PlayerOptionsP1OnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100
PlayerOptionsP1OffCommand=linear,1;addy,-100 PlayerOptionsP1OffCommand=linear,1;addy,100
PlayerOptionsP1ExtraX=320 PlayerOptionsP1ExtraX=320
PlayerOptionsP1ExtraY=46 PlayerOptionsP1ExtraY=46
PlayerOptionsP1ExtraOnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100 PlayerOptionsP1ExtraOnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100
PlayerOptionsP1ExtraOffCommand=linear,1;addy,100 PlayerOptionsP1ExtraOffCommand=linear,1;addy,-100
PlayerOptionsP2X=320 PlayerOptionsP2X=320
PlayerOptionsP2Y=450 PlayerOptionsP2Y=450
PlayerOptionsP2OnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100 PlayerOptionsP2OnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100
PlayerOptionsP2OffCommand=linear,1;addy,-100 PlayerOptionsP2OffCommand=linear,1;addy,100
PlayerOptionsP2ExtraX=320 PlayerOptionsP2ExtraX=320
PlayerOptionsP2ExtraY=30 PlayerOptionsP2ExtraY=30
PlayerOptionsP2ExtraOnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100 PlayerOptionsP2ExtraOnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100
PlayerOptionsP2ExtraOffCommand=linear,1;addy,100 PlayerOptionsP2ExtraOffCommand=linear,1;addy,-100
SongOptionsX=320 SongOptionsX=320
SongOptionsY=470 SongOptionsY=470
SongOptionsOnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100 SongOptionsOnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100
@@ -1063,11 +1063,11 @@ WinFrameP2Y=256
WinFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 WinFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
WinFrameP2OffCommand=linear,0.7;diffusealpha,0 WinFrameP2OffCommand=linear,0.7;diffusealpha,0
WinP1X=96 WinP1X=96
WinP1Y=240 WinP1Y=256
WinP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 WinP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
WinP1OffCommand=linear,0.7;diffusealpha,0 WinP1OffCommand=linear,0.7;diffusealpha,0
WinP2X=544 WinP2X=544
WinP2Y=240 WinP2Y=256
WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
WinP2OffCommand=linear,0.7;diffusealpha,0 WinP2OffCommand=linear,0.7;diffusealpha,0
ScoreLabelX=320 ScoreLabelX=320
@@ -1235,7 +1235,7 @@ ShowGood=1
ShowBoo=1 ShowBoo=1
ShowMiss=1 ShowMiss=1
ShowOK=1 ShowOK=1
ShowMaxCombo=1 ShowMaxCombo=0
ShowScoreArea=1 ShowScoreArea=1
ShowTimeArea=0 ShowTimeArea=0
HelpText=Press START to continue HelpText=Press START to continue
+1
View File
@@ -151,6 +151,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
const bool bReverse = GAMESTATE->m_PlayerOptions[pn].m_fReverseScroll == 1; const bool bReverse = GAMESTATE->m_PlayerOptions[pn].m_fReverseScroll == 1;
bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyleDef()->m_StyleType==StyleDef::ONE_PLAYER_TWO_CREDITS; bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyleDef()->m_StyleType==StyleDef::ONE_PLAYER_TWO_CREDITS;
m_Combo.SetX( COMBO_X(m_PlayerNumber,bPlayerUsingBothSides) ); m_Combo.SetX( COMBO_X(m_PlayerNumber,bPlayerUsingBothSides) );
m_Combo.SetY( bReverse ? SCREEN_BOTTOM-COMBO_Y : SCREEN_TOP+COMBO_Y );
m_Judgment.SetX( JUDGMENT_X(m_PlayerNumber,bPlayerUsingBothSides) ); m_Judgment.SetX( JUDGMENT_X(m_PlayerNumber,bPlayerUsingBothSides) );
m_Judgment.SetY( bReverse ? SCREEN_BOTTOM-JUDGMENT_Y : SCREEN_TOP+JUDGMENT_Y ); m_Judgment.SetY( bReverse ? SCREEN_BOTTOM-JUDGMENT_Y : SCREEN_TOP+JUDGMENT_Y );
+1 -1
View File
@@ -492,7 +492,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
UtilSetXYAndOnCommand( m_sprWinFrame[p], "ScreenEvaluation" ); UtilSetXYAndOnCommand( m_sprWinFrame[p], "ScreenEvaluation" );
this->AddChild( &m_sprWinFrame[p] ); this->AddChild( &m_sprWinFrame[p] );
m_sprWin[p].Load( THEME->GetPathToN("ScreenEvaluation win 2x2") ); m_sprWin[p].Load( THEME->GetPathToG("ScreenEvaluation win 2x2") );
m_sprWin[p].StopAnimating(); m_sprWin[p].StopAnimating();
bool bIsWinner = GAMESTATE->GetWinner() == p; bool bIsWinner = GAMESTATE->GetWinner() == p;
m_sprWin[p].SetState( (bIsWinner?0:2) + p ); m_sprWin[p].SetState( (bIsWinner?0:2) + p );