Run the consistency scripts

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index a0641955609138a43fc1f396e6c6be54469ee716..d00eac9dba134837ba4f89a0dc5de07bfaaae43b 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -713,7 +713,7 @@ void CSQCModel_Hook_PreUpdate(entity this, bool isnew, bool isplayer, bool isloc
 void CSQCModel_Hook_PostUpdate(entity this, bool isnew, bool isplayer, bool islocalplayer)
 {
        // is it a player model? (shared state)
-       bool is_playermodel = (substring(this.model, 0, 14) == "models/player/" || substring(this.model, 0, 17) == "models/ok_player/" || 
+       bool is_playermodel = (substring(this.model, 0, 14) == "models/player/" || substring(this.model, 0, 17) == "models/ok_player/" ||
                                                        (substring(this.model, 0, 16) == "models/monsters/" && (this.isplayermodel & BIT(1))));
        this.isplayermodel = BITSET(this.isplayermodel, ISPLAYER_MODEL, is_playermodel);
 

diff --git a/qcsrc/common/mapobjects/trigger/swamp.qc b/qcsrc/common/mapobjects/trigger/swamp.qc
index 0717f4beadd4eeb4aa0ae1c2a7cfcc94af38a0f9..87e653b1f836ea84492937e24e35bd7377adafbd 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/swamp.qc
+++ b/qcsrc/common/mapobjects/trigger/swamp.qc
@@ -18,7 +18,7 @@
 
 .float swamp_interval; //Hurt players in swamp with this interval
 .float swamp_slowdown; //Players in swamp get slowd down by this mutch 0-1 is slowdown 1-~ is speedup (!?)
-.float swamp_lifetime;  // holds the points remaining until slug dies (not quite health!) 
+.float swamp_lifetime;  // holds the points remaining until slug dies (not quite health!)
 .entity swampslug;
 
 #ifdef SVQC

diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
index fc571678b2c7f22ea1032f2f4a3d6e580cc83a02..0a76a633d7792bbe1cdc6f187c44bdf4dfa5d100 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
@@ -18,7 +18,7 @@ int autocvar_g_instagib_extralives;
 float autocvar_g_instagib_speed_highspeed;
 
 IntrusiveList g_instagib_items;
-STATIC_INIT()
+STATIC_INIT(g_instagib_items)
 {
        g_instagib_items = IL_NEW();
        IL_PUSH(g_instagib_items, ITEM_VaporizerCells);

diff --git a/qcsrc/common/mutators/mutator/overkill/_mod.inc b/qcsrc/common/mutators/mutator/overkill/_mod.inc
index 017cc2082adfc7a9468e293dde68c276160abff5..227be462699dbe7c827edbfe2acc682bbebf7608 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/_mod.inc
+++ b/qcsrc/common/mutators/mutator/overkill/_mod.inc
@@ -1,15 +1,16 @@
 // generated file; do not modify
+#include <common/mutators/mutator/overkill/okhmg.qc>
+#include <common/mutators/mutator/overkill/okmachinegun.qc>
+#include <common/mutators/mutator/overkill/oknex.qc>
+#include <common/mutators/mutator/overkill/okrpc.qc>
+#include <common/mutators/mutator/overkill/okshotgun.qc>
+#include <common/mutators/mutator/overkill/overkill.qc>
 #ifdef CSQC
     #include <common/mutators/mutator/overkill/cl_overkill.qc>
 #endif
 #ifdef SVQC
     #include <common/mutators/mutator/overkill/sv_overkill.qc>
 #endif
-#include <common/mutators/mutator/overkill/okhmg.qc>
-#include <common/mutators/mutator/overkill/okmachinegun.qc>
-#include <common/mutators/mutator/overkill/oknex.qc>
-#include <common/mutators/mutator/overkill/okrpc.qc>
-#include <common/mutators/mutator/overkill/okshotgun.qc>
 #ifdef SVQC
     #include <common/mutators/mutator/overkill/sv_weapons.qc>
 #endif

diff --git a/qcsrc/common/mutators/mutator/overkill/_mod.qh b/qcsrc/common/mutators/mutator/overkill/_mod.qh
index 7731f17e169e9191fb49996c819cdf1ec200faa8..c652f5a373e378e644985e8ac6cbaee7c806a775 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/_mod.qh
+++ b/qcsrc/common/mutators/mutator/overkill/_mod.qh
@@ -1,12 +1,16 @@
 // generated file; do not modify
+#include <common/mutators/mutator/overkill/okhmg.qh>
+#include <common/mutators/mutator/overkill/okmachinegun.qh>
+#include <common/mutators/mutator/overkill/oknex.qh>
+#include <common/mutators/mutator/overkill/okrpc.qh>
+#include <common/mutators/mutator/overkill/okshotgun.qh>
+#include <common/mutators/mutator/overkill/overkill.qh>
 #ifdef CSQC
     #include <common/mutators/mutator/overkill/cl_overkill.qh>
 #endif
 #ifdef SVQC
     #include <common/mutators/mutator/overkill/sv_overkill.qh>
 #endif
-#include <common/mutators/mutator/overkill/okhmg.qh>
-#include <common/mutators/mutator/overkill/okmachinegun.qh>
-#include <common/mutators/mutator/overkill/oknex.qh>
-#include <common/mutators/mutator/overkill/okrpc.qh>
-#include <common/mutators/mutator/overkill/okshotgun.qh>
+#ifdef SVQC
+    #include <common/mutators/mutator/overkill/sv_weapons.qh>
+#endif

diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc
new file mode 100644 (file)
index 0000000..3cb64ce
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -0,0 +1 @@
+#include "overkill.qh"

diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qh b/qcsrc/common/mutators/mutator/overkill/overkill.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 15a2fc2e0c972427c1270223e0f40ad178609b81..c8e07a4732dab2d43bfdba4f6a00cd5ba13291b7 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -11,7 +11,7 @@ bool autocvar_g_overkill_itemwaypoints = true;
 .Weapon ok_lastwep[MAX_WEAPONSLOTS];
 
 IntrusiveList g_overkill_items;
-STATIC_INIT()
+STATIC_INIT(g_overkill_items)
 {
        g_overkill_items = IL_NEW();
        IL_PUSH(g_overkill_items, ITEM_HealthMega);

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_weapons.qc b/qcsrc/common/mutators/mutator/overkill/sv_weapons.qc
index 4a131e3f030728a046b37ee63b58ea8ca75343da..5952a25c2c3e6a82d99dc274ca4ab1c0a7ae28af 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_weapons.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_weapons.qc
@@ -1,3 +1,4 @@
+#include "sv_weapons.qh"
 string autocvar_g_overkill_weapons;
 
 REGISTER_MUTATOR(ok_weapons, expr_evaluate(autocvar_g_overkill_weapons) || MUTATOR_IS_ENABLED(ok))

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_weapons.qh b/qcsrc/common/mutators/mutator/overkill/sv_weapons.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/overkill/sv_weapons.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/common/mutators/mutator/weaponarena_random/sv_weaponarena_random.qc b/qcsrc/common/mutators/mutator/weaponarena_random/sv_weaponarena_random.qc
index 32b6f3930595ec6376b56e204b39bf46c5fc3db9..6a296b812814d25e4359116054eda8e8a1b40ccb 100644 (file)
--- a/qcsrc/common/mutators/mutator/weaponarena_random/sv_weaponarena_random.qc
+++ b/qcsrc/common/mutators/mutator/weaponarena_random/sv_weaponarena_random.qc
@@ -9,7 +9,7 @@ MUTATOR_HOOKFUNCTION(weaponarena_random, SetStartItems)
                g_weaponarena_random = cvar("g_weaponarena_random");
        else
                g_weaponarena_random = 0;
-       
+
        g_weaponarena_random_with_blaster = cvar("g_weaponarena_random_with_blaster");
 }
 

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 9ea1925495fb16937da5ff8b225568f6ff5aefae..909f34c5621f87fa74c1ccfe2dbdb594f9960832 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -624,7 +624,7 @@ float adjust_respawntime(float normal_respawntime) {
                }
        }
        TeamBalance_Destroy(balance);
-       
+
        if (players >= 2) {
                return normal_respawntime * (r / (players + o) + l);
        } else {

diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc
index 00a9e5403fcd22236a8f2bd77fef45c095eb9b1b..3f324ba397318c3cfd23ddef2915a07c15e21dae 100644 (file)
--- a/qcsrc/menu/xonotic/_mod.inc
+++ b/qcsrc/menu/xonotic/_mod.inc
@@ -59,6 +59,7 @@
 #include <menu/xonotic/dialog_sandboxtools.qc>
 #include <menu/xonotic/dialog_settings.qc>
 #include <menu/xonotic/dialog_settings_audio.qc>
+#include <menu/xonotic/dialog_settings_bindings_reset.qc>
 #include <menu/xonotic/dialog_settings_effects.qc>
 #include <menu/xonotic/dialog_settings_game.qc>
 #include <menu/xonotic/dialog_settings_game_crosshair.qc>
@@ -70,7 +71,6 @@
 #include <menu/xonotic/dialog_settings_game_weapons.qc>
 #include <menu/xonotic/dialog_settings_input.qc>
 #include <menu/xonotic/dialog_settings_input_userbind.qc>
-#include <menu/xonotic/dialog_settings_bindings_reset.qc>
 #include <menu/xonotic/dialog_settings_misc.qc>
 #include <menu/xonotic/dialog_settings_misc_cvars.qc>
 #include <menu/xonotic/dialog_settings_misc_reset.qc>

diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh
index 5d72a56171fdb2a1cd0be51d79416815878b6303..1b3e09081aab1c6075b26eb94b2e704e2ad6b31a 100644 (file)
--- a/qcsrc/menu/xonotic/_mod.qh
+++ b/qcsrc/menu/xonotic/_mod.qh
@@ -59,6 +59,7 @@
 #include <menu/xonotic/dialog_sandboxtools.qh>
 #include <menu/xonotic/dialog_settings.qh>
 #include <menu/xonotic/dialog_settings_audio.qh>
+#include <menu/xonotic/dialog_settings_bindings_reset.qh>
 #include <menu/xonotic/dialog_settings_effects.qh>
 #include <menu/xonotic/dialog_settings_game.qh>
 #include <menu/xonotic/dialog_settings_game_crosshair.qh>
@@ -70,7 +71,6 @@
 #include <menu/xonotic/dialog_settings_game_weapons.qh>
 #include <menu/xonotic/dialog_settings_input.qh>
 #include <menu/xonotic/dialog_settings_input_userbind.qh>
-#include <menu/xonotic/dialog_settings_bindings_reset.qh>
 #include <menu/xonotic/dialog_settings_misc.qh>
 #include <menu/xonotic/dialog_settings_misc_cvars.qh>
 #include <menu/xonotic/dialog_settings_misc_reset.qh>

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 8261f36b39c391e77feb62374397d671f3bf549a..93c8134b27ad09627b8157c0c6fd32698c54d91a 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1592,7 +1592,7 @@ void player_regen(entity this)
                limith = limith * limit_mod;
                limita = limita * limit_mod;
 
-               SetResource(this, RES_ARMOR, CalcRotRegen(GetResource(this, RES_ARMOR), mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, 
+               SetResource(this, RES_ARMOR, CalcRotRegen(GetResource(this, RES_ARMOR), mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear,
                                                                        regen_mod * frametime * (time > this.pauseregen_finished), maxa, autocvar_g_balance_armor_rot, autocvar_g_balance_armor_rotlinear,
                                                                        rot_mod * frametime * (time > this.pauserotarmor_finished), limita));
                SetResource(this, RES_HEALTH, CalcRotRegen(GetResource(this, RES_HEALTH), regen_health_stable, regen_health, regen_health_linear,
@@ -1618,7 +1618,7 @@ void player_regen(entity this)
                minf = autocvar_g_balance_fuel_regenstable;
                limitf = GetResourceLimit(this, RES_FUEL);
 
-               SetResource(this, RES_FUEL, CalcRotRegen(GetResource(this, RES_FUEL), minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, 
+               SetResource(this, RES_FUEL, CalcRotRegen(GetResource(this, RES_FUEL), minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear,
                                                                                frametime * (time > this.pauseregen_finished) * ((this.items & ITEM_JetpackRegen.m_itemid) != 0),
                                                                                maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > this.pauserotfuel_finished), limitf));
        }

diff --git a/qcsrc/server/clientkill.qh b/qcsrc/server/clientkill.qh
index 5b26adf9150f155caa4551c6a08e9b0fcdcb56e7..a0f1981792e86604984add971169ec6e5a6cec8c 100644 (file)
--- a/qcsrc/server/clientkill.qh
+++ b/qcsrc/server/clientkill.qh
@@ -1,3 +1,4 @@
+#pragma once
 
 // set when showing a kill countdown
 .entity killindicator;

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index e8fc1b13f1bbd5b5e897060ebd402ae5eec457da..1e3d9b096d27cad8b1ea7f36f02870b8ae4266a2 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -608,7 +608,7 @@ void GameCommand_delrec(int request, int argc)  // perhaps merge later with reco
 }
 
 void print_Effect_Index(int d, string effect_name)
-{ 
+{
        // this is inside a function to avoid expanding it on compilation everytime
        LOG_INFO("effect ", effect_name, " is ", ftos(_particleeffectnum(effect_name)), "\n");
        db_put(d, effect_name, "1");