add odd and even commands to HoldJudgment

This commit is contained in:
Chris Danford
2004-03-23 19:44:32 +00:00
parent c8c4f97ed0
commit 28598fa289
3 changed files with 23 additions and 0 deletions
+4
View File
@@ -2971,6 +2971,10 @@ BooCommand=shadowlength,4;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;
MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0 MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0
[HoldJudgment] [HoldJudgment]
NGOddCommand=
OKOddCommand=
NGEvenCommand=
OKEvenCommand=
NGCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0;diffusealpha,0 NGCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0;diffusealpha,0
OKCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0 OKCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0
+18
View File
@@ -20,12 +20,26 @@
CachedThemeMetric OK_COMMAND ("HoldJudgment","OKCommand"); CachedThemeMetric OK_COMMAND ("HoldJudgment","OKCommand");
CachedThemeMetric NG_COMMAND ("HoldJudgment","NGCommand"); CachedThemeMetric NG_COMMAND ("HoldJudgment","NGCommand");
CachedThemeMetric OK_ODD_COMMAND ("HoldJudgment","OKOddCommand");
CachedThemeMetric NG_ODD_COMMAND ("HoldJudgment","NGOddCommand");
CachedThemeMetric OK_EVEN_COMMAND ("HoldJudgment","OKEvenCommand");
CachedThemeMetric NG_EVEN_COMMAND ("HoldJudgment","NGEvenCommand");
HoldJudgment::HoldJudgment() HoldJudgment::HoldJudgment()
{ {
OK_COMMAND.Refresh(); OK_COMMAND.Refresh();
NG_COMMAND.Refresh(); NG_COMMAND.Refresh();
OK_ODD_COMMAND.Refresh();
NG_ODD_COMMAND.Refresh();
OK_EVEN_COMMAND.Refresh();
NG_EVEN_COMMAND.Refresh();
m_iCount = 0;
m_sprJudgment.Load( THEME->GetPathToG("HoldJudgment 1x2") ); m_sprJudgment.Load( THEME->GetPathToG("HoldJudgment 1x2") );
m_sprJudgment.StopAnimating(); m_sprJudgment.StopAnimating();
Reset(); Reset();
@@ -62,13 +76,17 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
ASSERT(0); ASSERT(0);
case HNS_OK: case HNS_OK:
m_sprJudgment.SetState( 0 ); m_sprJudgment.SetState( 0 );
m_sprJudgment.Command( (m_iCount%2) ? OK_ODD_COMMAND : OK_EVEN_COMMAND );
m_sprJudgment.Command( OK_COMMAND ); m_sprJudgment.Command( OK_COMMAND );
break; break;
case HNS_NG: case HNS_NG:
m_sprJudgment.SetState( 1 ); m_sprJudgment.SetState( 1 );
m_sprJudgment.Command( (m_iCount%2) ? NG_ODD_COMMAND : NG_EVEN_COMMAND );
m_sprJudgment.Command( NG_COMMAND ); m_sprJudgment.Command( NG_COMMAND );
break; break;
default: default:
ASSERT(0); ASSERT(0);
} }
m_iCount++;
} }
+1
View File
@@ -31,6 +31,7 @@ public:
protected: protected:
Sprite m_sprJudgment; Sprite m_sprJudgment;
int m_iCount;
}; };
#endif #endif