From 1a42ad7d4ecea9cd8b85cafc4bbb38e08b788e7b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 31 Aug 2006 23:06:22 +0000 Subject: [PATCH] simplify --- stepmania/src/OptionRowHandler.cpp | 10 ---------- stepmania/src/OptionRowHandler.h | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index 031d16f4ed..4f9b5c1f0f 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -1198,16 +1198,6 @@ class OptionRowHandlerNull: public OptionRowHandler { public: OptionRowHandlerNull() { Init(); } - virtual void LoadInternal( const Commands &cmds ) - { - } - virtual void ImportOption( const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const - { - } - virtual int ExportOption( const vector &vpns, const vector vbSelected[NUM_PLAYERS] ) const - { - return 0; - } }; diff --git a/stepmania/src/OptionRowHandler.h b/stepmania/src/OptionRowHandler.h index 77b0512520..c239d469a6 100644 --- a/stepmania/src/OptionRowHandler.h +++ b/stepmania/src/OptionRowHandler.h @@ -32,7 +32,7 @@ public: m_cmds = cmds; this->LoadInternal( cmds ); } - virtual void LoadInternal( const Commands &cmds ) = 0; + virtual void LoadInternal( const Commands &cmds ) { } /* * We may re-use OptionRowHandlers. This is called before each @@ -49,9 +49,9 @@ public: enum ReloadChanged { RELOAD_CHANGED_NONE, RELOAD_CHANGED_ENABLED, RELOAD_CHANGED_ALL }; virtual ReloadChanged Reload() { return RELOAD_CHANGED_NONE; } - virtual void ImportOption( const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const = 0; + virtual void ImportOption( const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const { } /* Returns an OPT mask. */ - virtual int ExportOption( const vector &vpns, const vector vbSelected[NUM_PLAYERS] ) const = 0; + virtual int ExportOption( const vector &vpns, const vector vbSelected[NUM_PLAYERS] ) const { return 0; } virtual void GetIconTextAndGameCommand( int iFirstSelection, RString &sIconTextOut, GameCommand &gcOut ) const; virtual RString GetScreen( int iChoice ) const { return RString(); } };