From: otta8634 <k9wolf@pm.me>
Date: Mon, 3 Feb 2025 11:26:09 +0000 (+0800)
Subject: Remove some unnecessary changes
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a2f5cffd2a2a0094e918f53a311d168e7f6b385;p=xonotic%2Fxonotic-data.pk3dir.git

Remove some unnecessary changes

In all weapon files a newline was probably accidentally deleted by myself, re-added it so the diff is simplified.
Also removed one unnecessary include in common/gamemodes/gamemode/onslaught/onslaught.qc,
... and fixed the gametype description of CTS.
---

diff --git a/qcsrc/common/gamemodes/gamemode/cts/cts.qh b/qcsrc/common/gamemodes/gamemode/cts/cts.qh
index 075488fe6a..166ae53376 100644
--- a/qcsrc/common/gamemodes/gamemode/cts/cts.qh
+++ b/qcsrc/common/gamemodes/gamemode/cts/cts.qh
@@ -8,7 +8,7 @@
 CLASS(RaceCTS, Gametype)
     INIT(RaceCTS)
     {
-        this.gametype_init(this, _("Race CTS"),"cts","g_cts",0,"cloaked","timelimit=20",_("Race to the finish line for fastest time"));
+        this.gametype_init(this, _("Race CTS"),"cts","g_cts",0,"cloaked","timelimit=20",_("Race to the finish line for the fastest time"));
     }
     METHOD(RaceCTS, m_generate_mapinfo, void(Gametype this, string v))
     {
diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
index a284bf3457..6d2e472dac 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
@@ -68,7 +68,6 @@ MUTATOR_HOOKFUNCTION(cl_ons, CustomizeEventchase)
 #endif // CSQC
 #ifdef MENUQC
 #include <common/gamemodes/gamemode/assault/assault.qh>
-#include <common/gamemodes/gamemode/domination/domination.qh>
 
 METHOD(Onslaught, describe, string(Onslaught this))
 {
diff --git a/qcsrc/common/gamemodes/gamemode/survival/survival.qh b/qcsrc/common/gamemodes/gamemode/survival/survival.qh
index fb7534074f..7c5d8c7c40 100644
--- a/qcsrc/common/gamemodes/gamemode/survival/survival.qh
+++ b/qcsrc/common/gamemodes/gamemode/survival/survival.qh
@@ -9,7 +9,7 @@ void HUD_Mod_Survival(vector pos, vector mySize);
 CLASS(Survival, Gametype)
     INIT(Survival)
     {
-        this.gametype_init(this, _("Survival"), "surv", "g_survival", GAMETYPE_FLAG_USEPOINTS, "", "timelimit=20 pointlimit=12",_("Identify and eliminate all the hunters before all your allies are gone"));
+        this.gametype_init(this, _("Survival"), "surv", "g_survival", GAMETYPE_FLAG_USEPOINTS, "", "timelimit=20 pointlimit=12", _("Identify and eliminate all the hunters before all your allies are gone"));
     }
     METHOD(Survival, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter))
     {
diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh
index 9526157440..34c2bb0fd4 100644
--- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh
@@ -44,6 +44,7 @@ CLASS(OverkillHeavyMachineGun, Weapon)
 	END()
 	W_PROPS(X, OverkillHeavyMachineGun, okhmg)
 #undef X
+
 ENDCLASS(OverkillHeavyMachineGun)
 REGISTER_WEAPON(OVERKILL_HMG, NEW(OverkillHeavyMachineGun));
 
diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
index a39205dfde..b51c2fb69a 100644
--- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
@@ -45,6 +45,7 @@ CLASS(OverkillMachineGun, Weapon)
 	END()
 	W_PROPS(X, OverkillMachineGun, okmachinegun)
 #undef X
+
 ENDCLASS(OverkillMachineGun)
 REGISTER_WEAPON(OVERKILL_MACHINEGUN, NEW(OverkillMachineGun));
 
diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh
index 58e8f92ef4..6dfe2fc5f1 100644
--- a/qcsrc/common/mutators/mutator/overkill/oknex.qh
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh
@@ -57,6 +57,7 @@ CLASS(OverkillNex, Weapon)
 	END()
 	W_PROPS(X, OverkillNex, oknex)
 #undef X
+
 ENDCLASS(OverkillNex)
 REGISTER_WEAPON(OVERKILL_NEX, NEW(OverkillNex));
 
diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh
index 1b39fff393..64ec5a5e8f 100644
--- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh
@@ -49,6 +49,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon)
 	END()
 	W_PROPS(X, OverkillRocketPropelledChainsaw, okrpc)
 #undef X
+
 ENDCLASS(OverkillRocketPropelledChainsaw)
 REGISTER_WEAPON(OVERKILL_RPC, NEW(OverkillRocketPropelledChainsaw));
 
diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
index cf611bc9e3..4f57b986f0 100644
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
@@ -46,6 +46,7 @@ CLASS(OverkillShotgun, Weapon)
 	END()
 	W_PROPS(X, OverkillShotgun, okshotgun)
 #undef X
+
 ENDCLASS(OverkillShotgun)
 REGISTER_WEAPON(OVERKILL_SHOTGUN, NEW(OverkillShotgun));
 
diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh
index f769073bab..c8dc315921 100644
--- a/qcsrc/common/weapons/weapon/arc.qh
+++ b/qcsrc/common/weapons/weapon/arc.qh
@@ -78,6 +78,7 @@ CLASS(Arc, Weapon)
 	END()
 	W_PROPS(X, Arc, arc)
 #undef X
+
 ENDCLASS(Arc)
 REGISTER_WEAPON(ARC, NEW(Arc));
 
diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh
index b98b7f7d13..74c1fcedcc 100644
--- a/qcsrc/common/weapons/weapon/blaster.qh
+++ b/qcsrc/common/weapons/weapon/blaster.qh
@@ -43,6 +43,7 @@ CLASS(Blaster, Weapon)
 	END()
 	W_PROPS(X, Blaster, blaster)
 #undef X
+
 ENDCLASS(Blaster)
 REGISTER_WEAPON(BLASTER, NEW(Blaster));
 
diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh
index 872eb43844..c082ac02da 100644
--- a/qcsrc/common/weapons/weapon/crylink.qh
+++ b/qcsrc/common/weapons/weapon/crylink.qh
@@ -58,6 +58,7 @@ CLASS(Crylink, Weapon)
 	END()
 	W_PROPS(X, Crylink, crylink)
 #undef X
+
 ENDCLASS(Crylink)
 REGISTER_WEAPON(CRYLINK, NEW(Crylink));
 
diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh
index f79f720fb1..2d69ae0dac 100644
--- a/qcsrc/common/weapons/weapon/devastator.qh
+++ b/qcsrc/common/weapons/weapon/devastator.qh
@@ -64,6 +64,7 @@ CLASS(Devastator, Weapon)
 	END()
 	W_PROPS(X, Devastator, devastator)
 #undef X
+
 ENDCLASS(Devastator)
 REGISTER_WEAPON(DEVASTATOR, NEW(Devastator));
 
diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh
index e87d70029b..4b79c58890 100644
--- a/qcsrc/common/weapons/weapon/electro.qh
+++ b/qcsrc/common/weapons/weapon/electro.qh
@@ -72,6 +72,7 @@ CLASS(Electro, Weapon)
 	END()
 	W_PROPS(X, Electro, electro)
 #undef X
+
 ENDCLASS(Electro)
 REGISTER_WEAPON(ELECTRO, NEW(Electro));
 
diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh
index fffbe084be..216791dd64 100644
--- a/qcsrc/common/weapons/weapon/fireball.qh
+++ b/qcsrc/common/weapons/weapon/fireball.qh
@@ -52,6 +52,7 @@ CLASS(Fireball, Weapon)
 	END()
 	W_PROPS(X, Fireball, fireball)
 #undef X
+
 ENDCLASS(Fireball)
 REGISTER_WEAPON(FIREBALL, NEW(Fireball));
 
diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh
index 1e74e69799..b460958d9e 100644
--- a/qcsrc/common/weapons/weapon/hagar.qh
+++ b/qcsrc/common/weapons/weapon/hagar.qh
@@ -56,6 +56,7 @@ CLASS(Hagar, Weapon)
 	END()
 	W_PROPS(X, Hagar, hagar)
 #undef X
+
 ENDCLASS(Hagar)
 REGISTER_WEAPON(HAGAR, NEW(Hagar));
 
diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh
index 3c333756a1..e5b25c91b1 100644
--- a/qcsrc/common/weapons/weapon/hlac.qh
+++ b/qcsrc/common/weapons/weapon/hlac.qh
@@ -51,6 +51,7 @@ CLASS(HLAC, Weapon)
 	END()
 	W_PROPS(X, HLAC, hlac)
 #undef X
+
 ENDCLASS(HLAC)
 REGISTER_WEAPON(HLAC, NEW(HLAC));
 
diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh
index 72e6ad1826..5ca68d1fa9 100644
--- a/qcsrc/common/weapons/weapon/hook.qh
+++ b/qcsrc/common/weapons/weapon/hook.qh
@@ -48,6 +48,7 @@ CLASS(Hook, Weapon)
 	END()
 	W_PROPS(X, Hook, hook)
 #undef X
+
 ENDCLASS(Hook)
 REGISTER_WEAPON(HOOK, NEW(Hook));
 
diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh
index 7593270c31..89b014d148 100644
--- a/qcsrc/common/weapons/weapon/machinegun.qh
+++ b/qcsrc/common/weapons/weapon/machinegun.qh
@@ -62,6 +62,7 @@ CLASS(MachineGun, Weapon)
 	END()
 	W_PROPS(X, MachineGun, machinegun)
 #undef X
+
 ENDCLASS(MachineGun)
 REGISTER_WEAPON(MACHINEGUN, NEW(MachineGun));
 
diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh
index 6b6976a2b2..3c8d7940a1 100644
--- a/qcsrc/common/weapons/weapon/minelayer.qh
+++ b/qcsrc/common/weapons/weapon/minelayer.qh
@@ -53,6 +53,7 @@ CLASS(MineLayer, Weapon)
 	END()
 	W_PROPS(X, MineLayer, minelayer)
 #undef X
+
 ENDCLASS(MineLayer)
 REGISTER_WEAPON(MINE_LAYER, NEW(MineLayer));
 
diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh
index bce9e43731..3fedbbb569 100644
--- a/qcsrc/common/weapons/weapon/mortar.qh
+++ b/qcsrc/common/weapons/weapon/mortar.qh
@@ -54,6 +54,7 @@ CLASS(Mortar, Weapon)
 	END()
 	W_PROPS(X, Mortar, mortar)
 #undef X
+
 ENDCLASS(Mortar)
 REGISTER_WEAPON(MORTAR, NEW(Mortar));
 
diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh
index 0b9557d0be..a6b120e4a5 100644
--- a/qcsrc/common/weapons/weapon/porto.qh
+++ b/qcsrc/common/weapons/weapon/porto.qh
@@ -33,6 +33,7 @@ CLASS(PortoLaunch, Weapon)
 	END()
 	W_PROPS(X, PortoLaunch, porto)
 #undef X
+
 ENDCLASS(PortoLaunch)
 REGISTER_WEAPON(PORTO, NEW(PortoLaunch));
 
diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh
index c5cc4e8f49..f009b589fc 100644
--- a/qcsrc/common/weapons/weapon/rifle.qh
+++ b/qcsrc/common/weapons/weapon/rifle.qh
@@ -52,6 +52,7 @@ CLASS(Rifle, Weapon)
 	END()
 	W_PROPS(X, Rifle, rifle)
 #undef X
+
 ENDCLASS(Rifle)
 REGISTER_WEAPON(RIFLE, NEW(Rifle));
 
diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh
index f6a006df67..4cb0a8f130 100644
--- a/qcsrc/common/weapons/weapon/seeker.qh
+++ b/qcsrc/common/weapons/weapon/seeker.qh
@@ -82,6 +82,7 @@ CLASS(Seeker, Weapon)
 	END()
 	W_PROPS(X, Seeker, seeker)
 #undef X
+
 ENDCLASS(Seeker)
 REGISTER_WEAPON(SEEKER, NEW(Seeker));
 
diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh
index 3e2b525e2f..d0ea5329ab 100644
--- a/qcsrc/common/weapons/weapon/shockwave.qh
+++ b/qcsrc/common/weapons/weapon/shockwave.qh
@@ -71,6 +71,7 @@ CLASS(Shockwave, Weapon)
 	END()
 	W_PROPS(X, Shockwave, shockwave)
 #undef X
+
 ENDCLASS(Shockwave)
 REGISTER_WEAPON(SHOCKWAVE, NEW(Shockwave));
 
diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh
index b12ec5b7b9..7bc6e3dee1 100644
--- a/qcsrc/common/weapons/weapon/shotgun.qh
+++ b/qcsrc/common/weapons/weapon/shotgun.qh
@@ -59,6 +59,7 @@ CLASS(Shotgun, Weapon)
 	END()
 	W_PROPS(X, Shotgun, shotgun)
 #undef X
+
 ENDCLASS(Shotgun)
 REGISTER_WEAPON(SHOTGUN, NEW(Shotgun));
 
diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh
index 31a569d7bb..c32b76a0dd 100644
--- a/qcsrc/common/weapons/weapon/tuba.qh
+++ b/qcsrc/common/weapons/weapon/tuba.qh
@@ -38,6 +38,7 @@ CLASS(Tuba, Weapon)
 	END()
 	W_PROPS(X, Tuba, tuba)
 #undef X
+
 ENDCLASS(Tuba)
 REGISTER_WEAPON(TUBA, NEW(Tuba));
 
diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh
index ca00741f45..5a91d4ff95 100644
--- a/qcsrc/common/weapons/weapon/vaporizer.qh
+++ b/qcsrc/common/weapons/weapon/vaporizer.qh
@@ -43,6 +43,7 @@ CLASS(Vaporizer, Weapon)
 	END()
 	W_PROPS(X, Vaporizer, vaporizer)
 #undef X
+
 ENDCLASS(Vaporizer)
 REGISTER_WEAPON(VAPORIZER, NEW(Vaporizer));
 
diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh
index a41b09de35..8c988fa81b 100644
--- a/qcsrc/common/weapons/weapon/vortex.qh
+++ b/qcsrc/common/weapons/weapon/vortex.qh
@@ -61,6 +61,7 @@ CLASS(Vortex, Weapon)
 	END()
 	W_PROPS(X, Vortex, vortex)
 #undef X
+
 ENDCLASS(Vortex)
 REGISTER_WEAPON(VORTEX, NEW(Vortex));