sm-ssc v1.0 Public Beta 1 code changes

This commit is contained in:
AJ Kelly
2010-03-01 00:44:39 -06:00
parent 42baa6f3f9
commit 02c7037721
40 changed files with 481 additions and 494 deletions
+4 -8
View File
@@ -30,9 +30,7 @@ public:
virtual void TweenOnScreen();
virtual void TweenOffScreen();
//
// Lua
//
virtual void PushSelf( lua_State *L );
protected:
@@ -40,10 +38,10 @@ protected:
void SetHelpText( RString s );
AutoActor m_sprUnderlay;
MemoryCardDisplay *m_MemoryCardDisplay[NUM_PLAYERS];
MemoryCardDisplay *m_MemoryCardDisplay[NUM_PLAYERS];
MenuTimer *m_MenuTimer;
AutoActor m_sprOverlay;
vector<Actor*> m_vDecorations;
vector<Actor*> m_vDecorations;
Transition m_In;
Transition m_Out;
@@ -53,11 +51,11 @@ protected:
ThemeMetric<bool> MUSIC_ALIGN_BEAT;
ThemeMetric<bool> CANCEL_TRANSITIONS_OUT;
ThemeMetric<float> TIMER_SECONDS;
ThemeMetric<RString> TIMER_METRICS_GROUP;
ThemeMetric<RString> TIMER_METRICS_GROUP;
ThemeMetric<bool> RESET_GAMESTATE;
private:
RString m_sPathToMusic;
RString m_sPathToMusic;
};
class ScreenWithMenuElementsSimple: public ScreenWithMenuElements
@@ -66,9 +64,7 @@ public:
void MenuStart( const InputEventPlus &input );
void MenuBack( const InputEventPlus &input );
//
// Lua
//
virtual void PushSelf( lua_State *L );
protected: