actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix name conflict between HoldJudgment::Reset and Actor::Reset

Browse Source 
prefer AutoActor over Sprite
This commit is contained in:
Glenn Maynard
2005-10-05 22:26:02 +00:00
parent 363f995814
commit c411e8a4ac
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/HoldJudgment.cpp
+10 -10
View File
@@ -12,17 +12,17 @@ static ThemeMetric<apActorCommands> NG_COMMAND ("HoldJudgment","NGCommand");
HoldJudgment::HoldJudgment() HoldJudgment::HoldJudgment()
{ {
m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") ); m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") );
m_sprJudgment.StopAnimating(); m_sprJudgment->StopAnimating();
ResetAnimation(); ResetAnimation();
this->AddChild( &m_sprJudgment ); this->AddChild( m_sprJudgment );
} }
void HoldJudgment::ResetAnimation() void HoldJudgment::ResetAnimation()
{ {
m_sprJudgment.SetDiffuse( RageColor(1,1,1,0) ); m_sprJudgment->SetDiffuse( RageColor(1,1,1,0) );
m_sprJudgment.SetXY( 0, 0 ); m_sprJudgment->SetXY( 0, 0 );
m_sprJudgment.StopTweening(); m_sprJudgment->StopTweening();
m_sprJudgment.StopEffect(); m_sprJudgment->StopEffect();
} }
void HoldJudgment::SetHoldJudgment( HoldNoteScore hns ) void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
@@ -36,12 +36,12 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
case HNS_NONE: case HNS_NONE:
ASSERT(0); ASSERT(0);
case HNS_OK: case HNS_OK:
m_sprJudgment.SetState( 0 ); m_sprJudgment->SetState( 0 );
m_sprJudgment.RunCommands( OK_COMMAND ); m_sprJudgment->RunCommands( OK_COMMAND );
break; break;
case HNS_NG: case HNS_NG:
m_sprJudgment.SetState( 1 ); m_sprJudgment->SetState( 1 );
m_sprJudgment.RunCommands( NG_COMMAND ); m_sprJudgment->RunCommands( NG_COMMAND );
break; break;
default: default:
ASSERT(0); ASSERT(0);
stepmania/src/HoldJudgment.h
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef HOLD_JUDGMENT_H #ifndef HOLD_JUDGMENT_H
#define HOLD_JUDGMENT_H #define HOLD_JUDGMENT_H
#include "Sprite.h"
#include "ActorFrame.h" #include "ActorFrame.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "AutoActor.h"
class HoldJudgment : public ActorFrame class HoldJudgment : public ActorFrame
@@ -11,11 +11,11 @@ class HoldJudgment : public ActorFrame
public: public:
HoldJudgment(); HoldJudgment();
void Reset();
void SetHoldJudgment( HoldNoteScore hns ); void SetHoldJudgment( HoldNoteScore hns );
protected: protected:
Sprite m_sprJudgment; void ResetAnimation();
AutoActor m_sprJudgment;
}; };
#endif #endif