Jeck - Some basic options handling rewrites, main menu update, example alternate theme (for testing). I'm closing issues 44 and 45, as hopefully this resolves them satisfactorily.
* The alternate theme is just useful for testing themes, but please comment on the changes to the main theme. * Options reading and initializing separated from UI. * Options UI abstracted a bit, made more easily extensible. * With some extension, the options UI could be used as the basis for more complicated themes, if we load a file and use it to do stuff like GameStateOptions::Start()
This commit is contained in:
@@ -6,10 +6,9 @@
|
||||
|
||||
#define SHOW_OPTIONS 1
|
||||
#define SHOW_OPTIONS_MENU 2
|
||||
#define SHOW_OPTIONS_PROFILE 3
|
||||
|
||||
class GameApp;
|
||||
class OptionsMenu;
|
||||
class WGuiTabMenu;
|
||||
class SimpleMenu;
|
||||
class SimplePad;
|
||||
|
||||
@@ -17,13 +16,13 @@ class GameStateOptions: public GameState, public JGuiListener
|
||||
{
|
||||
private:
|
||||
float timer;
|
||||
bool mReload;
|
||||
|
||||
public:
|
||||
SimpleMenu * optionsMenu;
|
||||
SimpleMenu * confirmMenu;
|
||||
OptionsMenu * optionsTabs;
|
||||
|
||||
WGuiTabMenu * optionsTabs;
|
||||
int mState;
|
||||
|
||||
GameStateOptions(GameApp* parent);
|
||||
virtual ~GameStateOptions();
|
||||
|
||||
@@ -33,8 +32,9 @@ private:
|
||||
virtual void Render();
|
||||
void ButtonPressed(int controllerId, int ControlId);
|
||||
|
||||
string newProfile;
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user