Merge branch 'master' into Mario/wepent_experimental

[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 fc79400434e4fd58fd4fbfdf85b9a30bc7a990e2..1a77e989121b0cade1ab49e584f93e6e575b29d4 100644 (file)
--- 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"
@@ -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);
 
@@ -74,6 +73,4 @@ const int TUR_FIRST = 1;
 
 REGISTER_TURRET(Null, NEW(Turret));
 
-#include "all.inc"
-
-#endif
+#include "turret/_mod.inc"