Merge branch 'master' into terencehill/player_sorting

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / all.qh

diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh
index 3d0528a2511825742d89fd27ac0ecfc727a1d440..5bebc285db77fbcdc8c9fc5c75686601a3911ac0 100644 (file)
--- a/qcsrc/common/turrets/all.qh
+++ b/qcsrc/common/turrets/all.qh
@@ -6,8 +6,7 @@
 #include "turret.qh"
 
 REGISTRY(Turrets, BITS(5))
-#define Turrets_from(i) _Turrets_from(i, TUR_Null)
-#define get_turretinfo(i) Turrets_from(i)
+#define get_turretinfo(i) REGISTRY_GET(Turrets, i)
 REGISTER_REGISTRY(Turrets)
 REGISTRY_CHECK(Turrets)
 
@@ -57,7 +56,9 @@ REGISTRY_CHECK(Turrets)
        #define TR_CONFIG_END()
 #endif
 
-GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
+#define DEFAULT_FILENAME "turrets_dump.cfg"
+// NOTE: dumpeffectinfo, dumpnotifs, dumpturrets and dumpweapons use similar code
+GENERIC_COMMAND(dumpturrets, "Dump all turrets into " DEFAULT_FILENAME, false)
 {
     switch(request)
     {
@@ -70,12 +71,12 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
 
             if(filename == "")
             {
-                filename = "turrets_dump.cfg";
+                filename = DEFAULT_FILENAME;
                 tur_config_alsoprint = false;
             }
             else if(filename == "-")
             {
-                filename = "turrets_dump.cfg";
+                filename = DEFAULT_FILENAME;
                 tur_config_alsoprint = true;
             }
             tur_config_file = fopen(filename, FILE_WRITE);
@@ -93,7 +94,7 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
                 LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename);
             }
             #else
-            LOG_INFO(_("Turrets dump command only works with sv_cmd."));
+            LOG_INFO("Turrets dump command only works with sv_cmd.");
             #endif
             return;
         }
@@ -101,21 +102,23 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
         default:
         case CMD_REQUEST_USAGE:
         {
-            LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpturrets [filename]");
-            LOG_INFO("  Where 'filename' is the file to write (default is turrets_dump.cfg),");
-            LOG_INFO("  if supplied with '-' output to console as well as default,");
-            LOG_INFO("  if left blank, it will only write to default.");
+            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpturrets [<filename>]");
+            LOG_HELPF("  Where <filename> is the file to write (default is %s),", DEFAULT_FILENAME);
+            LOG_HELP("  if supplied with '-' output to console as well as default,");
+            LOG_HELP("  if left blank, it will only write to default.");
             return;
         }
     }
 }
+#undef DEFAULT_FILENAME
 
 
 const int TUR_FIRST = 1;
-#define TUR_LAST (Turrets_COUNT - 1)
+#define TUR_LAST (REGISTRY_COUNT(Turrets) - 1)
 
 #define REGISTER_TURRET(id, inst) REGISTER(Turrets, TUR, id, m_id, inst)
 
 REGISTER_TURRET(Null, NEW(Turret));
+REGISTRY_DEFINE_GET(Turrets, TUR_Null)
 
 #include "turret/_mod.qh"