--- lbbs/include/menu.h	2005/03/19 14:44:21	1.4
+++ lbbs/include/menu.h	2005/05/06 15:48:44	1.7
@@ -15,61 +15,67 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef _MENU_H_
+#define _MENU_H_
+
 #define	MAX_MENUITEM_LENGTH		50
 #define	MAX_MENUITEMS			30
-#define MAX_MENUNAME_LENGTH		20
+#define MAX_MENUNAME_LENGTH		256
 #define MAX_MENUACTION_LENGTH		20
 #define MAX_MENUTITLE_LENGTH		50
 #define MAX_MENUS			256
 #define MAX_MENU_DEPTH			50
 
-struct _menu_item {
-	int row, col, r_row, r_col;
-	char action[MAX_MENUACTION_LENGTH];
-	int submenu;
-	int priv, display;
-	char name[MAX_MENUNAME_LENGTH];
-	char text[MAX_MENUITEM_LENGTH];
+struct _menu_item
+{
+  int row, col, r_row, r_col;
+  char action[MAX_MENUACTION_LENGTH];
+  int submenu;
+  int priv, level, display;
+  char name[MAX_MENUNAME_LENGTH];
+  char text[MAX_MENUITEM_LENGTH];
 };
 typedef struct _menu_item MENU_ITEM;
 
-struct _menu_title {
-	int row, col;
-	char text[MAX_MENUTITLE_LENGTH];
+struct _menu_title
+{
+  int row, col, show;
+  char text[MAX_MENUTITLE_LENGTH];
 };
 typedef struct _menu_title MENU_TITLE;
 
-struct _menu_screen {
-	int row, col;
-	char filename[256];
+struct _menu_screen
+{
+  int row, col, show;
+  char filename[256];
 };
 typedef struct _menu_screen MENU_SCREEN;
 
-struct _menu {
-	char name[MAX_MENUNAME_LENGTH];
-	MENU_TITLE title;
-	MENU_SCREEN screen;
-	MENU_ITEM *items[MAX_MENUITEMS];
-	int item_count, item_cur_pos;
+struct _menu
+{
+  char name[MAX_MENUNAME_LENGTH];
+  MENU_TITLE title;
+  MENU_SCREEN screen;
+  MENU_ITEM *items[MAX_MENUITEMS];
+  int item_count, item_cur_pos;
 };
 typedef struct _menu MENU;
 
-struct _menu_set {
-	MENU *p_menu[MAX_MENUS];
-	MENU *p_menu_select[MAX_MENU_DEPTH];
-	int menu_count;
-	int menu_select_depth;
+struct _menu_set
+{
+  MENU *p_menu[MAX_MENUS];
+  MENU *p_menu_select[MAX_MENU_DEPTH];
+  int menu_count;
+  int menu_select_depth;
 };
 typedef struct _menu_set MENU_SET;
-	
+
 extern MENU_SET bbs_menu;
 
-const char *
-menu_control (MENU_SET * p_menu_set, int key);
+extern int menu_control (MENU_SET * p_menu_set, int key);
 
-int
-display_menu (MENU * p_menu);
+extern int display_menu (MENU * p_menu);
 
-MENU * 
-get_menu (MENU_SET * p_menu_set, const char * menu_name);
+extern MENU *get_menu (MENU_SET * p_menu_set, const char *menu_name);
 
+#endif //_MENU_H_