diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 0c7b366062..1921315bab 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -214,11 +214,6 @@ void EditMenu::RefreshAll() } } -void EditMenu::DrawPrimitives() -{ - ActorFrame::DrawPrimitives(); -} - bool EditMenu::CanGoUp() { return m_SelectedRow != 0; diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h index cb763963db..4b3d83cc5e 100644 --- a/stepmania/src/EditMenu.h +++ b/stepmania/src/EditMenu.h @@ -45,7 +45,6 @@ class EditMenu: public ActorFrame public: EditMenu(); ~EditMenu(); - virtual void DrawPrimitives(); bool CanGoUp(); bool CanGoDown(); diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp index 239c08e755..1f873edab3 100644 --- a/stepmania/src/GradeDisplay.cpp +++ b/stepmania/src/GradeDisplay.cpp @@ -2,7 +2,6 @@ #include "GradeDisplay.h" #include "RageUtil.h" #include "GameConstantsAndTypes.h" -#include "PrefsManager.h" #include "ThemeManager.h" #include "RageTexture.h" #include "arch/Dialog/Dialog.h" @@ -74,11 +73,6 @@ void GradeDisplay::Update( float fDeltaTime ) } } -void GradeDisplay::DrawPrimitives() -{ - Sprite::DrawPrimitives(); -} - int GradeDisplay::GetFrameIndex( PlayerNumber pn, Grade g ) { if( this->m_pTexture->GetID().filename.Find("_blank") != -1 ) diff --git a/stepmania/src/GradeDisplay.h b/stepmania/src/GradeDisplay.h index 3bad4efbb3..45414e2d9c 100644 --- a/stepmania/src/GradeDisplay.h +++ b/stepmania/src/GradeDisplay.h @@ -4,7 +4,6 @@ #define GRADE_DISPLAY_H #include "Sprite.h" -#include "PrefsManager.h" #include "Grade.h" #include "PlayerNumber.h" @@ -16,16 +15,15 @@ public: virtual bool Load( RageTextureID ID ); virtual void Update( float fDeltaTime ); - virtual void DrawPrimitives(); void SetGrade( PlayerNumber pn, Grade g ); void Spin(); void SettleImmediately(); void SettleQuickly(); - Grade GetGrade () const {return m_Grade;} + Grade GetGrade () const { return m_Grade; } + protected: - int GetFrameIndex( PlayerNumber pn, Grade g ); PlayerNumber m_PlayerNumber; diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index 75f65dc822..ed0e26031f 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -265,11 +265,6 @@ void MusicWheelItem::RefreshGrades() } } -void MusicWheelItem::DrawPrimitives() -{ - WheelItemBase::DrawPrimitives(); -} - /* * (c) 2001-2004 Chris Danford, Chris Gomez, Glenn Maynard * All rights reserved. diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h index bcf6e9682d..120c9ad66a 100644 --- a/stepmania/src/MusicWheelItem.h +++ b/stepmania/src/MusicWheelItem.h @@ -23,7 +23,6 @@ public: MusicWheelItem(CString sType = "MusicWheelItem"); virtual void LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded ); - void DrawPrimitives(); void RefreshGrades(); WheelItemData *data;