summaryrefslogtreecommitdiffstats
path: root/menu_demo/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'menu_demo/menu.c')
-rw-r--r--menu_demo/menu.c28
1 files changed, 19 insertions, 9 deletions
diff --git a/menu_demo/menu.c b/menu_demo/menu.c
index b265fbb..8f9b4a4 100644
--- a/menu_demo/menu.c
+++ b/menu_demo/menu.c
@@ -1,17 +1,27 @@
-#ifdef G_OS_WIN32
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
+#ifdef G_OS_WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
#endif
#include <gl\gl.h>
+#include "button.h"
+
enum MenuState {
MENU_MAIN,
- MENU_OPTIONS,
- MENU_SELECTION
+ MENU_START,
+ MENU_OPTIONS
+};
+
+struct MenuStruct {
+ int i;
};
-int g_iState;
+int g_iState; // which menu are we in
+
+struct MenuStruct g_sMenuMain; // definition of the main menu
+struct MenuStruct g_sMenuStart; // definition of the start menu
+struct MenuStruct g_sMenuOptions; // definition of the options menu
void MenuMainRender(void)
{
@@ -49,7 +59,7 @@ int MenuGetState(void)
void MenuRender(void)
{
- glColor3d(0, 0, 0);
+ glColor3d(1, 1, 1);
switch (g_iState)
{
@@ -57,11 +67,11 @@ void MenuRender(void)
MenuMainRender();
break;
- case MENU_OPTIONS:
+ case MENU_START:
MenuOptionsRender();
break;
- case MENU_SELECTION:
+ case MENU_OPTIONS:
MenuSelectionRender();
break;