From 0de94fb55cd3c5946a471e61212c7b6b505e7134 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Sep 2006 19:48:46 +0000 Subject: [PATCH] remove Actor:: --- stepmania/src/EditMenu.cpp | 2 +- stepmania/src/NoteField.cpp | 10 +++++----- stepmania/src/OptionIcon.cpp | 4 ++-- stepmania/src/ScreenBookkeeping.cpp | 18 +++++++++--------- stepmania/src/ScreenDebugOverlay.cpp | 6 +++--- stepmania/src/ScreenSyncOverlay.cpp | 6 +++--- stepmania/src/ScreenUnlockStatus.cpp | 6 +++--- stepmania/src/StreamDisplay.cpp | 6 +++--- stepmania/src/WorkoutGraph.cpp | 4 ++-- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index ae342de2f5..be021150f5 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -143,7 +143,7 @@ void EditMenu::Load( const RString &sType ) m_textLabel[r].SetXY( ROW_LABELS_X, ROW_Y.GetValue(r) ); m_textLabel[r].SetText( EditMenuRowToLocalizedString(r) ); m_textLabel[r].RunCommands( ROW_LABEL_ON_COMMAND ); - m_textLabel[r].SetHorizAlign( Actor::align_left ); + m_textLabel[r].SetHorizAlign( align_left ); this->AddChild( &m_textLabel[r] ); m_textValue[r].LoadFromFont( THEME->GetPathF(sType,"value") ); diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 694c04a606..9c3a181aed 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -261,7 +261,7 @@ void NoteField::DrawBeatBar( const float fBeat ) { m_textMeasureNumber.SetDiffuse( RageColor(1,1,1,1) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,0) ); - m_textMeasureNumber.SetHorizAlign( Actor::align_right ); + m_textMeasureNumber.SetHorizAlign( align_right ); m_textMeasureNumber.SetText( ssprintf("%d", iMeasureNoDisplay) ); m_textMeasureNumber.SetXY( -fWidth/2, fYPos ); m_textMeasureNumber.Draw(); @@ -306,7 +306,7 @@ void NoteField::DrawBPMText( const float fBeat, const float fBPM ) const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); m_textMeasureNumber.SetZoom( fZoom ); - m_textMeasureNumber.SetHorizAlign( Actor::align_right ); + m_textMeasureNumber.SetHorizAlign( align_right ); m_textMeasureNumber.SetDiffuse( RageColor(1,0,0,1) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetText( ssprintf("%.3f", fBPM) ); @@ -321,7 +321,7 @@ void NoteField::DrawFreezeText( const float fBeat, const float fSecs ) const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); m_textMeasureNumber.SetZoom( fZoom ); - m_textMeasureNumber.SetHorizAlign( Actor::align_right ); + m_textMeasureNumber.SetHorizAlign( align_right ); m_textMeasureNumber.SetDiffuse( RageColor(0.8f,0.8f,0,1) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetText( ssprintf("%.3f", fSecs) ); @@ -336,7 +336,7 @@ void NoteField::DrawAttackText( const float fBeat, const Attack &attack ) const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); m_textMeasureNumber.SetZoom( fZoom ); - m_textMeasureNumber.SetHorizAlign( Actor::align_left ); + m_textMeasureNumber.SetHorizAlign( align_left ); m_textMeasureNumber.SetDiffuse( RageColor(0,0.8f,0.8f,1) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetText( attack.GetTextDescription() ); @@ -351,7 +351,7 @@ void NoteField::DrawBGChangeText( const float fBeat, const RString sNewBGName ) const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); m_textMeasureNumber.SetZoom( fZoom ); - m_textMeasureNumber.SetHorizAlign( Actor::align_left ); + m_textMeasureNumber.SetHorizAlign( align_left ); m_textMeasureNumber.SetDiffuse( RageColor(0,1,0,1) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetText( sNewBGName ); diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp index 1e3ef1afe9..00e3d57ae8 100644 --- a/stepmania/src/OptionIcon.cpp +++ b/stepmania/src/OptionIcon.cpp @@ -37,8 +37,8 @@ void OptionIcon::Load( RString sType ) m_text.SetShadowLength( 0 ); m_text.SetZoom( TEXT_ZOOM ); m_text.SetXY( TEXT_OFFSET_X, TEXT_OFFSET_Y ); - m_text.SetHorizAlign( (Actor::HorizAlign)TEXT_H_ALIGN ); - m_text.SetVertAlign( (Actor::VertAlign)TEXT_V_ALIGN ); + m_text.SetHorizAlign( (HorizAlign)TEXT_H_ALIGN ); + m_text.SetVertAlign( (VertAlign)TEXT_V_ALIGN ); this->AddChild( &m_text ); } diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp index b27def1bcb..58511b28a5 100644 --- a/stepmania/src/ScreenBookkeeping.cpp +++ b/stepmania/src/ScreenBookkeeping.cpp @@ -139,10 +139,10 @@ void ScreenBookkeeping::ChangeView( View newView ) sData += ssprintf("%i\n", iTotalLast); m_textData[0].SetText( "" ); - m_textData[1].SetHorizAlign( Actor::align_left ); + m_textData[1].SetHorizAlign( align_left ); m_textData[1].SetText( sTitle ); m_textData[2].SetText( "" ); - m_textData[3].SetHorizAlign( Actor::align_right ); + m_textData[3].SetHorizAlign( align_right ); m_textData[3].SetText( sData ); } break; @@ -163,7 +163,7 @@ void ScreenBookkeeping::ChangeView( View newView ) sTemp += LastWeekToLocalizedString(week) + ssprintf(": %d",coins[week]) + "\n"; } - m_textData[col].SetHorizAlign( Actor::align_left ); + m_textData[col].SetHorizAlign( align_left ); m_textData[col].SetText( sTemp ); } } @@ -183,10 +183,10 @@ void ScreenBookkeeping::ChangeView( View newView ) } m_textData[0].SetText( "" ); - m_textData[1].SetHorizAlign( Actor::align_left ); + m_textData[1].SetHorizAlign( align_left ); m_textData[1].SetText( sTitle ); m_textData[2].SetText( "" ); - m_textData[3].SetHorizAlign( Actor::align_right ); + m_textData[3].SetHorizAlign( align_right ); m_textData[3].SetText( sData ); } break; @@ -211,13 +211,13 @@ void ScreenBookkeeping::ChangeView( View newView ) sData2 += ssprintf("%d",coins[i]) + "\n"; } - m_textData[0].SetHorizAlign( Actor::align_left ); + m_textData[0].SetHorizAlign( align_left ); m_textData[0].SetText( sTitle1 ); - m_textData[1].SetHorizAlign( Actor::align_right ); + m_textData[1].SetHorizAlign( align_right ); m_textData[1].SetText( sData1 ); - m_textData[2].SetHorizAlign( Actor::align_left ); + m_textData[2].SetHorizAlign( align_left ); m_textData[2].SetText( sTitle2 ); - m_textData[3].SetHorizAlign( Actor::align_right ); + m_textData[3].SetHorizAlign( align_right ); m_textData[3].SetText( sData2 ); } break; diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp index ce252d89c6..f8b0d915f8 100644 --- a/stepmania/src/ScreenDebugOverlay.cpp +++ b/stepmania/src/ScreenDebugOverlay.cpp @@ -197,7 +197,7 @@ void ScreenDebugOverlay::Init() this->AddChild( &m_Quad ); m_textHeader.LoadFromFont( THEME->GetPathF("Common", "normal") ); - m_textHeader.SetHorizAlign( Actor::align_left ); + m_textHeader.SetHorizAlign( align_left ); m_textHeader.SetX( SCREEN_LEFT+20 ); m_textHeader.SetY( SCREEN_TOP+20 ); m_textHeader.SetZoom( 1.0f ); @@ -209,7 +209,7 @@ void ScreenDebugOverlay::Init() { BitmapText *pT1 = new BitmapText; pT1->LoadFromFont( THEME->GetPathF("Common", "normal") ); - pT1->SetHorizAlign( Actor::align_right ); + pT1->SetHorizAlign( align_right ); pT1->SetText( "blah" ); pT1->SetShadowLength( 2 ); m_vptextButton.push_back( pT1 ); @@ -218,7 +218,7 @@ void ScreenDebugOverlay::Init() { BitmapText *pT2 = new BitmapText; pT2->LoadFromFont( THEME->GetPathF("Common", "normal") ); - pT2->SetHorizAlign( Actor::align_left ); + pT2->SetHorizAlign( align_left ); pT2->SetText( "blah" ); pT2->SetShadowLength( 2 ); m_vptextFunction.push_back( pT2 ); diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp index 8b21aff5aa..6befc5d2c0 100644 --- a/stepmania/src/ScreenSyncOverlay.cpp +++ b/stepmania/src/ScreenSyncOverlay.cpp @@ -27,12 +27,12 @@ void ScreenSyncOverlay::Init() Screen::Init(); m_quad.SetDiffuse( RageColor(0,0,0,0) ); - m_quad.SetHorizAlign( Actor::align_left ); + m_quad.SetHorizAlign( align_left ); m_quad.SetXY( SCREEN_CENTER_X+10, SCREEN_TOP+100 ); this->AddChild( &m_quad ); m_textHelp.LoadFromFont( THEME->GetPathF("Common", "normal") ); - m_textHelp.SetHorizAlign( Actor::align_left ); + m_textHelp.SetHorizAlign( align_left ); m_textHelp.SetXY( SCREEN_CENTER_X+20, SCREEN_TOP+100 ); m_textHelp.SetDiffuseAlpha( 0 ); m_textHelp.SetZoom( 0.6f ); @@ -53,7 +53,7 @@ void ScreenSyncOverlay::Init() m_quad.ZoomToHeight( m_textHelp.GetZoomedHeight()+20 ); m_textStatus.LoadFromFont( THEME->GetPathF("Common", "normal") ); - m_textStatus.SetHorizAlign( Actor::align_center ); + m_textStatus.SetHorizAlign( align_center ); m_textStatus.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y+150 ); m_textStatus.SetZoom( 0.8f ); m_textStatus.SetShadowLength( 2 ); diff --git a/stepmania/src/ScreenUnlockStatus.cpp b/stepmania/src/ScreenUnlockStatus.cpp index e4f5cea731..7227c58238 100644 --- a/stepmania/src/ScreenUnlockStatus.cpp +++ b/stepmania/src/ScreenUnlockStatus.cpp @@ -41,7 +41,7 @@ void ScreenUnlockStatus::Init() unsigned NumUnlocks = UNLOCKMAN->m_UnlockEntries.size(); PointsUntilNextUnlock.LoadFromFont( THEME->GetPathF("Common","normal") ); - PointsUntilNextUnlock.SetHorizAlign( Actor::align_left ); + PointsUntilNextUnlock.SetHorizAlign( align_left ); apActorCommands IconCommand = ICON_COMMAND; for( unsigned i=1; i <= NumUnlocks; i++ ) @@ -97,7 +97,7 @@ void ScreenUnlockStatus::Init() BitmapText* text = new BitmapText; text->LoadFromFont( THEME->GetPathF("ScreenUnlockStatus","text") ); - text->SetHorizAlign( Actor::align_left ); + text->SetHorizAlign( align_left ); text->SetZoom(ScrollingTextZoom); switch( entry.m_Type ) @@ -235,7 +235,7 @@ void ScreenUnlockStatus::Init() BitmapText* NewText = new BitmapText; NewText->LoadFromFont( THEME->GetPathF("ScreenUnlockStatus","text") ); - NewText->SetHorizAlign( Actor::align_left ); + NewText->SetHorizAlign( align_left ); RString title = pSong->GetDisplayMainTitle(); RString subtitle = pSong->GetDisplaySubTitle(); diff --git a/stepmania/src/StreamDisplay.cpp b/stepmania/src/StreamDisplay.cpp index 8a264fc490..f084de4d07 100644 --- a/stepmania/src/StreamDisplay.cpp +++ b/stepmania/src/StreamDisplay.cpp @@ -197,9 +197,9 @@ void StreamDisplay::DrawStrip( float fRightEdgePercent, float fStripWidthInPerce m_sprStreamPassing.ZoomToHeight( m_fMeterHeight ); m_sprStreamHot.ZoomToHeight( m_fMeterHeight ); - m_sprStreamNormal.SetHorizAlign( Actor::align_right ); - m_sprStreamPassing.SetHorizAlign( Actor::align_right ); - m_sprStreamHot.SetHorizAlign( Actor::align_right ); + m_sprStreamNormal.SetHorizAlign( align_right ); + m_sprStreamPassing.SetHorizAlign( align_right ); + m_sprStreamHot.SetHorizAlign( align_right ); m_sprStreamNormal.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent ); m_sprStreamPassing.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent ); diff --git a/stepmania/src/WorkoutGraph.cpp b/stepmania/src/WorkoutGraph.cpp index c3de0da429..563f066e61 100644 --- a/stepmania/src/WorkoutGraph.cpp +++ b/stepmania/src/WorkoutGraph.cpp @@ -78,7 +78,7 @@ void WorkoutGraph::SetFromGameStateInternal( int iNumSongsToShowForCurrentStage float fBlockSize = min( fTotalWidth / iBlocksWide, fTotalHeight / iBlocksHigh ); - m_sprEmpty.SetVertAlign( Actor::align_bottom ); + m_sprEmpty.SetVertAlign( align_bottom ); m_sprEmpty.SetCustomImageRect( RectF(0,0,(float)iBlocksWide,(float)iBlocksHigh) ); m_sprEmpty.ZoomToWidth( iBlocksWide * fBlockSize ); m_sprEmpty.ZoomToHeight( iBlocksHigh * fBlockSize ); @@ -89,7 +89,7 @@ void WorkoutGraph::SetFromGameStateInternal( int iNumSongsToShowForCurrentStage float fOffsetFromCenter = iIndex - (iBlocksWide-1)/2.0f; Sprite *p = new Sprite; p->Load( THEME->GetPathG("WorkoutGraph","bar") ); - p->SetVertAlign( Actor::align_bottom ); + p->SetVertAlign( align_bottom ); p->ZoomToWidth( fBlockSize ); int iMetersToCover = (MAX_METER - *iter); p->SetCustomImageRect( RectF(0,(float)iMetersToCover/(float)iBlocksHigh,1,1) );