X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=a63e62842f5ef41bc79ba5baa35e2212c2f4847e;hb=fc309f7ae1326142820a4b76b3b2afef4f0137e6;hp=44081dd9b8af37dd5475a7c1cd31fccd26529d4f;hpb=0256e57e16a302ad45090618b8d6eb5930788809;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index 44081dd9..a63e6284 100644
--- a/menu.h
+++ b/menu.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,47 +21,66 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MENU_H
 #define MENU_H
 
-//
-// the net drivers should just set the apropriate bits in m_activenet,
-// instead of having the menu code look through their internal tables
-//
-#define	MNET_IPX		1
-#define	MNET_TCP		2
+#define M_PROG_FILENAME "menu.dat"
+#define M_NAME	"menu"
+#define M_MAX_EDICTS	(1 << 11) // should be enough for a menu
 
 enum m_state_e {
 	m_none,
 	m_main,
 	m_demo,
 	m_singleplayer,
+	m_transfusion_episode,
+	m_transfusion_skill,
 	m_load,
 	m_save,
 	m_multiplayer,
 	m_setup,
-	m_net,
 	m_options,
 	m_video,
 	m_keys,
 	m_help,
+	m_credits,
 	m_quit,
 	m_lanconfig,
 	m_gameoptions,
-	m_search,
-	m_slist
+	m_slist,
+	m_options_effects,
+	m_options_graphics,
+	m_options_colorcontrol,
+	m_reset
 };
 
-extern int m_activenet;
-extern int m_return_state;
 extern enum m_state_e m_state;
-extern qboolean m_return_onerror;
 extern char m_return_reason[32];
+void M_Update_Return_Reason(char *s);
 
-//
-// menus
+/*
+// hard-coded menus
 //
 void M_Init (void);
 void M_Keydown (int key);
 void M_Draw (void);
 void M_ToggleMenu_f (void);
 
+//
+// menu prog menu
+//
+void MP_Init (void);
+void MP_Keydown (int key);
+void MP_Draw (void);
+void MP_ToggleMenu_f (void);
+void MP_Shutdown (void);*/
+
+//
+// menu router
+//
+void MR_Init_Commands (void);
+void MR_Init (void);
+void MR_Restart (void);
+void (*MR_Keydown) (int key, char ascii);
+void (*MR_Draw) (void);
+void (*MR_ToggleMenu_f) (void);
+void (*MR_Shutdown) (void);
 #endif