- turned menu into a class, still a lot of public variables around and menu_item...

[supertux.git] / src / menu.h

diff --git a/src/menu.h b/src/menu.h
index 67593f3..1a36691 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -32,38 +32,50 @@ enum MenuItemKind {
   MN_HL /* horizontal line */
 };
 
-typedef struct menu_item_type
+class Menu;
+
+struct menu_item_type
   {
     MenuItemKind kind;
     int toggled;
     char *text;
     char *input;
     string_list_type* list;
-    void* target_menu;
-  }
-menu_item_type;
+    Menu* target_menu;
+};
 
-menu_item_type* menu_item_create(MenuItemKind kind, char *text, int init_toggle, void* target_menu);
+menu_item_type* menu_item_create(MenuItemKind kind, char *text, int init_toggle, Menu* target_menu);
 void menu_item_change_text (menu_item_type* pmenu_item, const char *text);
 void menu_item_change_input(menu_item_type* pmenu_item, const char *text);
 
-typedef struct menu_type
-  {
-    int num_items;
-    int active_item;
-    int arrange_left;
-    menu_item_type *item;
-    timer_type effect;
-  }
-menu_type;
-
-void menu_init   (menu_type* pmenu);
-void menu_free   (menu_type* pmenu);
-void menu_additem(menu_type* pmenu, menu_item_type* pmenu_item);
-void menu_action (menu_type* pmenu);
-int  menu_check  (menu_type* pmenu);
-void menu_draw   (menu_type* pmenu);
-void menu_set_current(menu_type* pmenu);
+class Menu
+{
+private:
+  // position of the menu (ie. center of the menu, not top/left)
+  int pos_x;
+  int pos_y;
+  
+  int num_items;
+
+public:
+  timer_type effect;
+  int arrange_left;
+  int active_item;
+  menu_item_type *item;
+
+  static void set_current(Menu* pmenu);
+
+  Menu();
+  ~Menu();
+
+  void additem(menu_item_type* pmenu_item);
+  void additem(MenuItemKind kind, char *text, int init_toggle, Menu* target_menu);
+  void action ();
+  int  check  ();
+  void draw   ();
+  void draw_item(int index, int menu_width, int menu_height);
+};
+
 
 /* Action done on the menu */
 enum MenuAction {
@@ -79,12 +91,18 @@ enum MenuAction {
 
 /* (global) menu variables */
 extern MenuAction menuaction;
-extern int show_menu;
-extern int menu_change;
+extern bool show_menu;
+extern bool menu_change;
 extern texture_type checkbox, checkbox_checked, back, arrow_left, arrow_right;
 
-extern menu_type main_menu, game_menu, options_menu, highscore_menu, load_game_menu, save_game_menu;
-extern menu_type* current_menu, * last_menu;
+extern Menu* main_menu;
+extern Menu* game_menu;
+extern Menu* options_menu;
+extern Menu* highscore_menu;
+extern Menu* load_game_menu;
+extern Menu* save_game_menu;
+extern Menu* current_menu;
+extern Menu* last_menu;
 
 /* input implementation variables */
 extern int delete_character;
@@ -101,3 +119,6 @@ void menu_event(SDL_keysym* keysym);
 
 #endif /*SUPERTUX_MENU_H*/
 
+/* Local Variables: */
+/* mode:c++ */
+/* End */