From 72435f148cdcafbbdb0704ff99c4047baf819485 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 17 Feb 2005 04:55:41 +0000 Subject: [PATCH] explicit types --- stepmania/src/HoldGhostArrow.cpp | 2 +- stepmania/src/ReceptorArrow.cpp | 6 +++--- stepmania/src/ScreenNameEntryTraditional.cpp | 2 +- stepmania/src/ScreenUnlock.cpp | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stepmania/src/HoldGhostArrow.cpp b/stepmania/src/HoldGhostArrow.cpp index 39b466a6ae..da2027f18c 100644 --- a/stepmania/src/HoldGhostArrow.cpp +++ b/stepmania/src/HoldGhostArrow.cpp @@ -10,7 +10,7 @@ HoldGhostArrow::HoldGhostArrow() void HoldGhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement ) { Sprite::Load( NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sElement) ); // not optional - this->RunCommands( NOTESKIN->GetMetricA(sNoteSkin,"HoldGhostArrow","OnCommand") ); + this->RunCommands( ActorCommands(NOTESKIN->GetMetricA(sNoteSkin,"HoldGhostArrow","OnCommand")) ); } void HoldGhostArrow::Update( float fDeltaTime ) diff --git a/stepmania/src/ReceptorArrow.cpp b/stepmania/src/ReceptorArrow.cpp index cea7ed904f..4cc5393b6c 100644 --- a/stepmania/src/ReceptorArrow.cpp +++ b/stepmania/src/ReceptorArrow.cpp @@ -36,9 +36,9 @@ bool ReceptorArrow::Load( CString NoteSkin, const PlayerState* pPlayerState, int m_pPressBlock.Load( NOTESKIN->GetPathToFromNoteSkinAndButton(NoteSkin,sButton,"KeypressBlock") ); - m_pReceptorWaiting->RunCommands( ParseCommands("effectclock,beat") ); - m_pReceptorGo->RunCommands( ParseCommands("effectclock,beat") ); - m_pPressBlock->RunCommands( ParseCommands("effectclock,beat") ); + m_pReceptorWaiting->SetEffectClock( Actor::EffectClock::CLOCK_BGM_BEAT ); + m_pReceptorGo->SetEffectClock( Actor::EffectClock::CLOCK_BGM_BEAT ); + m_pPressBlock->SetEffectClock( Actor::EffectClock::CLOCK_BGM_BEAT ); // draw pressblock before receptors this->AddChild( m_pPressBlock ); diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index c267156349..727a802cf2 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -442,7 +442,7 @@ void ScreenNameEntryTraditional::PositionCharsAndCursor( int pn ) const bool hidden = ( Pos < First || Pos > Last ); const int ActualPos = clamp( Pos, First-1, Last+1 ); - bt->RunCommands( ParseCommands("stoptweening;decelerate,.12") ); + bt->RunCommands( ActorCommands(ParseCommands("stoptweening;decelerate,.12")) ); bt->SetX( ActualPos * ALPHABET_GAP_X ); bt->SetDiffuseAlpha( hidden? 0.0f:1.0f ); } diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index 8abab43daa..15d4230ba7 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -166,12 +166,12 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) LOG->Trace("Target Row: %f", TargetRow); LOG->Trace("command for icon %d: %s", i, ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;linear,%f;y,%f;linear,0.1;diffusealpha,0", SECS_PER_CYCLE * (i - 1), FirstCycleTime, StopOffPoint, SecondCycleTime * 2, ScrollingTextEndY).c_str() ); CString sCommand = ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;linear,%f;y,%f;linear,0.1;diffusealpha,0", SECS_PER_CYCLE * (i - 1), FirstCycleTime, StopOffPoint, SecondCycleTime, ScrollingTextEndY); - text->RunCommands( ParseCommands(sCommand) ); + text->RunCommands( ActorCommands(ParseCommands(sCommand)) ); } else { CString sCommand = ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;linear,0.1;diffusealpha,0", SECS_PER_CYCLE * (i - 1), SECS_PER_CYCLE * (ScrollingTextRows), ScrollingTextEndY); - text->RunCommands( ParseCommands(sCommand) ); + text->RunCommands( ActorCommands(ParseCommands(sCommand)) ); } item.push_back(text); @@ -198,12 +198,12 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) LOG->Trace("Target Row: %f", TargetRow); LOG->Trace("command for icon %d: %s", i, ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;linear,%f;y,%f;linear,0.1;diffusealpha,0", SECS_PER_CYCLE * (i - 1), FirstCycleTime, StopOffPoint, SecondCycleTime * 2, ScrollingTextEndY).c_str() ); CString sCommand = ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;linear,%f;y,%f;linear,0.1;diffusealpha,0", SECS_PER_CYCLE * (i - 1), FirstCycleTime, StopOffPoint, SecondCycleTime, ScrollingTextEndY); - IconCount->RunCommands( ParseCommands(sCommand) ); + IconCount->RunCommands( ActorCommands(ParseCommands(sCommand)) ); } else { CString sCommand = ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;linear,0.1;diffusealpha,0", SECS_PER_CYCLE * (i - 1), SECS_PER_CYCLE * (ScrollingTextRows), ScrollingTextEndY); - IconCount->RunCommands( ParseCommands(sCommand) ); + IconCount->RunCommands( ActorCommands(ParseCommands(sCommand)) ); } ItemIcons.push_back(IconCount); @@ -269,7 +269,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) NewText->SetXY(ScrollingTextX, ScrollingTextStartY); { CString sCommand = ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;", SECS_PER_CYCLE * (NumUnlocks + 2 * i - 2), SECS_PER_CYCLE * ((ScrollingTextRows - i) * 2 + 1 ), (ScrollingTextStartY + (ScrollingTextEndY - ScrollingTextStartY) * (ScrollingTextRows - i + 0.5) / ScrollingTextRows )); - NewText->RunCommands( ParseCommands(sCommand) ); + NewText->RunCommands( ActorCommands(ParseCommands(sCommand)) ); } // new unlock graphic @@ -280,7 +280,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) NewIcon->SetWidth(UNLOCK_TEXT_SCROLL_ICON_SIZE); { CString sCommand = ssprintf("diffusealpha,0;sleep,%f;diffusealpha,1;linear,%f;y,%f;", SECS_PER_CYCLE * (NumUnlocks + 2 * i - 2), SECS_PER_CYCLE * ((ScrollingTextRows - i) * 2 + 1 ), (ScrollingTextStartY + (ScrollingTextEndY - ScrollingTextStartY) * (ScrollingTextRows - i + 0.5) / ScrollingTextRows )); - NewIcon->RunCommands( ParseCommands(sCommand) ); + NewIcon->RunCommands( ActorCommands(ParseCommands(sCommand)) ); } ItemIcons.push_back(NewIcon);