moved rsurface_ variables into rsurface struct as a minor cleanup

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index 6f5952c042ed32f34b40d8b0752a5a2d2826ec6f..8fdba99d725cf5e98e27d9a1a756677b6e85fe85 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define M_PROG_FILENAME "menu.dat"
 #define M_NAME "menu"
-#define M_MAX_EDICTS   (1 << 12) // should be enough for a menu
+#define M_MAX_EDICTS   32768 // hopefully won't have to increase this again anytime soon...
 
 enum m_state_e {
        m_none,
@@ -48,7 +48,8 @@ enum m_state_e {
        m_options_effects,
        m_options_graphics,
        m_options_colorcontrol,
-       m_reset
+       m_reset,
+       m_modlist
 };
 
 extern enum m_state_e m_state;
@@ -59,7 +60,7 @@ void M_Update_Return_Reason(char *s);
 // hard-coded menus
 //
 void M_Init (void);
-void M_Keydown (int key);
+void M_KeyEvent (int key);
 void M_Draw (void);
 void M_ToggleMenu_f (void);
 
@@ -67,7 +68,7 @@ void M_ToggleMenu_f (void);
 // menu prog menu
 //
 void MP_Init (void);
-void MP_Keydown (int key);
+void MP_KeyEvent (int key);
 void MP_Draw (void);
 void MP_ToggleMenu_f (void);
 void MP_Shutdown (void);*/
@@ -78,9 +79,9 @@ void MP_Shutdown (void);*/
 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);
+extern void (*MR_KeyEvent) (int key, char ascii, qboolean downevent);
+extern void (*MR_Draw) (void);
+extern void (*MR_ToggleMenu_f) (void);
+extern void (*MR_Shutdown) (void);
 #endif