From 20307748df7dd1354c3c055629fe4026638bee57 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 04:46:36 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScreenOptions.h | 3 +-- stepmania/src/ScreenOptionsMemoryCard.cpp | 5 ----- stepmania/src/ScreenOptionsMemoryCard.h | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index f600065687..10dba90066 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -42,8 +42,6 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); protected: - OptionRowType m_OptionRowType; - virtual void TweenOnScreen(); virtual void TweenOffScreen(); @@ -104,6 +102,7 @@ protected: // derived classes need access to these protected: /* Map menu lines to m_OptionRow entries. */ vector m_pRows; + OptionRowType m_OptionRowType; Navigation m_OptionsNavigation; InputMode m_InputMode; diff --git a/stepmania/src/ScreenOptionsMemoryCard.cpp b/stepmania/src/ScreenOptionsMemoryCard.cpp index 1529aa6085..3a39cb889f 100644 --- a/stepmania/src/ScreenOptionsMemoryCard.cpp +++ b/stepmania/src/ScreenOptionsMemoryCard.cpp @@ -87,11 +87,6 @@ void ScreenOptionsMemoryCard::HandleMessage( const CString& sMessage ) } } -void ScreenOptionsMemoryCard::MenuStart( const InputEventPlus &input ) -{ - ScreenOptions::MenuStart( input ); -} - void ScreenOptionsMemoryCard::ImportOptions( int iRow, const vector &vpns ) { diff --git a/stepmania/src/ScreenOptionsMemoryCard.h b/stepmania/src/ScreenOptionsMemoryCard.h index bf7f9e595c..15577b8171 100644 --- a/stepmania/src/ScreenOptionsMemoryCard.h +++ b/stepmania/src/ScreenOptionsMemoryCard.h @@ -11,8 +11,6 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); - virtual void MenuStart( const InputEventPlus &input ); - private: void ImportOptions( int iRow, const vector &vpns ); void ExportOptions( int iRow, const vector &vpns );