DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index 616de3f84813436c3022f89de8836eb9e024f395..44081dd9b8af37dd5475a7c1cd31fccd26529d4f 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -18,6 +18,9 @@ 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
@@ -25,7 +28,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define        MNET_IPX                1
 #define        MNET_TCP                2
 
-extern int     m_activenet;
+enum m_state_e {
+       m_none,
+       m_main,
+       m_demo,
+       m_singleplayer,
+       m_load,
+       m_save,
+       m_multiplayer,
+       m_setup,
+       m_net,
+       m_options,
+       m_video,
+       m_keys,
+       m_help,
+       m_quit,
+       m_lanconfig,
+       m_gameoptions,
+       m_search,
+       m_slist
+};
+
+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];
 
 //
 // menus
@@ -35,4 +63,5 @@ void M_Keydown (int key);
 void M_Draw (void);
 void M_ToggleMenu_f (void);
 
+#endif