From 30ec5bc8550af5a9687857d7c6d9f176b6e91f61 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 19 Feb 2011 23:38:12 -0600 Subject: [PATCH] ScreenPlayerOptions now derives from ScreenOptions, allowing it to get the new ScreenOptions bindings. --- src/ScreenPlayerOptions.cpp | 2 +- src/ScreenPlayerOptions.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ScreenPlayerOptions.cpp b/src/ScreenPlayerOptions.cpp index 1ae56fbf0d..d6c7f04a03 100644 --- a/src/ScreenPlayerOptions.cpp +++ b/src/ScreenPlayerOptions.cpp @@ -162,7 +162,7 @@ public: } }; -LUA_REGISTER_DERIVED_CLASS( ScreenPlayerOptions, ScreenWithMenuElements ) +LUA_REGISTER_DERIVED_CLASS( ScreenPlayerOptions, ScreenOptions ) // lua end /* diff --git a/src/ScreenPlayerOptions.h b/src/ScreenPlayerOptions.h index 37f322744b..e3dd5068be 100644 --- a/src/ScreenPlayerOptions.h +++ b/src/ScreenPlayerOptions.h @@ -15,9 +15,7 @@ public: virtual void HandleScreenMessage( const ScreenMessage SM ); bool GetGoToOptions() const { return m_bGoToOptions; } - // // Lua - // virtual void PushSelf( lua_State *L ); private: