Cleanup #includes

[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 5a5fe26a68ea7b191497c89d9793c8902d9abbb8..fb0ac17993edc742722fd08ae7c2a2c4b3c8b1b2 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -1,11 +1,11 @@
 #include "menu_cmd.qh"
 
 #include "../menu.qh"
-#include "../classes.qc"
+#include "../item.qh"
 
 #include "../mutators/events.qh"
 
-#include "../../common/command/generic.qh"
+#include <common/command/_all.qh>
 
 .entity firstChild, nextSibling;
 
@@ -72,34 +72,28 @@ void GameCommand(string theCommand)
        if (argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
        {
                string filter = string_null;
-               if (argv(0) == "directpanelhudmenu") filter = strzone("HUD");
+               if (argv(0) == "directpanelhudmenu") filter = "HUD";
 
                if (argc == 1)
                {
                        LOG_INFO(_("Available options:\n"));
-                       float i;
-                       entity e;
-                       string s;
 
-                       for (i = 0, e = NULL; (e = nextent(e)); )
-                               if (e.classname != "vtbl" && e.name != "")
+                       FOREACH_ENTITY_ORDERED(it.name != "", {
+                               if (it.classname == "vtbl") continue;
+                               string s = it.name;
+                               if (filter)
                                {
-                                       s = e.name;
-                                       if (filter)
-                                       {
-                                               if (substring(s, 0, strlen(filter)) != filter) continue;
-                                               s = substring(s, strlen(filter), strlen(s) - strlen(filter));
-                                       }
-                                       LOG_INFO(strcat(" ", s, "\n"));
-                                       ++i;
+                                       if (!startsWith(s, filter)) continue;
+                                       s = substring(s, strlen(filter), strlen(s) - strlen(filter));
                                }
+                               LOG_INFOF(" %s\n", s);
+                       });
                }
                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;
        }