X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fall.qh;h=1a77e989121b0cade1ab49e584f93e6e575b29d4;hb=add3116cfe9c5d1bfaec0e88b135e11c979b5edf;hp=fa6ef43d423c0aaeed39086f324d6f0be8d1b2b9;hpb=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh
index fa6ef43d4..1a77e9891 100644
--- a/qcsrc/common/turrets/all.qh
+++ b/qcsrc/common/turrets/all.qh
@@ -1,7 +1,6 @@
-#ifndef TURRETS_ALL_H
-#define TURRETS_ALL_H
+#pragma once
 
-#include "../command/all.qh"
+#include <common/command/_mod.qh>
 #include "config.qh"
 
 #include "turret.qh"
@@ -9,7 +8,7 @@
 REGISTRY(Turrets, BITS(5))
 #define Turrets_from(i) _Turrets_from(i, TUR_Null)
 #define get_turretinfo(i) Turrets_from(i)
-REGISTER_REGISTRY(RegisterTurrets)
+REGISTER_REGISTRY(Turrets)
 REGISTRY_CHECK(Turrets)
 
 
@@ -27,12 +26,12 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
             if(filename == "")
             {
                 filename = "turrets_dump.cfg";
-                tur_config_alsoprint = FALSE;
+                tur_config_alsoprint = false;
             }
             else if(filename == "-")
             {
                 filename = "turrets_dump.cfg";
-                tur_config_alsoprint = TRUE;
+                tur_config_alsoprint = true;
             }
             tur_config_file = fopen(filename, FILE_WRITE);
 
@@ -70,10 +69,8 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt")
 const int TUR_FIRST = 1;
 #define TUR_LAST (Turrets_COUNT - 1)
 
-#define REGISTER_TURRET(id, inst) REGISTER(RegisterTurrets, TUR, Turrets, id, m_id, inst)
+#define REGISTER_TURRET(id, inst) REGISTER(Turrets, TUR, id, m_id, inst)
 
 REGISTER_TURRET(Null, NEW(Turret));
 
-#include "all.inc"
-
-#endif
+#include "turret/_mod.inc"