Merge branch 'master' into Mario/qc_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / command / menu_cmd.qc

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index ee556ba00ecafe0b5b5be8c62d3faa0778c0c846..93825cd56098d73e2ebe53aa0aee97041fcaf03c 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -1,12 +1,6 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-       #include "../../dpdefs/menudefs.qc"
-    #include "../../common/util.qh"
-    #include "../oo/base.qh"
-    #include "menu_cmd.qh"
-    #include "../menu.qh"
-#elif defined(SVQC)
-#endif
+#include "menu_cmd.qh"
+
+#include "../../common/command/generic.qh"
 
 string _dumptree_space;
 void _dumptree_open(entity pass, entity me)
@@ -95,7 +89,10 @@ void GameCommand(string theCommand)
                                }
                }
                else if(argc == 2 && !isdemo()) // don't allow this command in demos
+               {
+                       m_play_click_sound(MENU_SOUND_OPEN);
                        m_goto(strcat(filter, argv(1))); // switch to a menu item
+               }
                if(filter)
                        strunzone(filter);
                return;