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 075488fe6a2b9850cace6625b6a88f922cff0d12..166ae53376fd9e769d94adcc1a874e38be72b49e 100644 (file)
--- 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 a284bf345790e5520729ca950f671262b9b35333..6d2e472dacc7d7eedfd72de668656ddf5d070428 100644 (file)
--- 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 fb7534074f667e3fd90b3e6b7ee3067aa3574f5a..7c5d8c7c40263af6403529534e9b396768b196f1 100644 (file)
--- 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 9526157440da0789b32c1c6043252bc6026b7bc3..34c2bb0fd4460134d4129909c5e9ee95501a55bd 100644 (file)
--- 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 a39205dfded87fd1bbebe1b9704a4fde272dae62..b51c2fb69ac4182e5b78b76dbad03e607556bd1b 100644 (file)
--- 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 58e8f92ef4b5ce5b0f63c9332c9ea28b2cc128c4..6dfe2fc5f16e5393a417fbd90da37fd33922049d 100644 (file)
--- 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 1b39fff39396f852f4b46240929b3cda4a428d15..64ec5a5e8f256791a0ee3e84651b6b80d34bec77 100644 (file)
--- 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 cf611bc9e31205f56c9831430061ecce0f74f708..4f57b986f033097f7a6991512a49307eef54ca54 100644 (file)
--- 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 f769073bab1962ad432c7a8dcf3968d01539bf14..c8dc3159211bad85e72e6ac3ebec4b9562dc70de 100644 (file)
--- 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 b98b7f7d13d7d54d0dcc1491f3dd3fc5ad16fef4..74c1fcedccb987fd7f2e8569546b10bd8e4a46d0 100644 (file)
--- 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 872eb43844bce9443a121a8c6912a4734ef1da69..c082ac02daad6b3633a7ce54e866c2cfa97eb032 100644 (file)
--- 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 f79f720fb18296aca8eeadcb0af43ffa243eb4b4..2d69ae0dac623f00c0970b9ede8a7637765784df 100644 (file)
--- 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 e87d70029b64ec537b46b6c8dd288ee232373b3e..4b79c5889083b1550926438103640dc196cc5188 100644 (file)
--- 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 fffbe084be693d9d27a269e6cd39ae8682a271e9..216791dd641d308d78ac2db97c011f0273fd53f7 100644 (file)
--- 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 1e74e69799e0553f0c257861ef69c1b15985eaf9..b460958d9eb5a9e0bb6018e078b24ef890e60a42 100644 (file)
--- 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 3c333756a10ab3da671a9d79da127bbd07048448..e5b25c91b1f3ea87329d58e56fa5721ce9379120 100644 (file)
--- 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 72e6ad1826c0fcc6db00f20aa51d6095971179b8..5ca68d1fa972ff346fa434376acc24bf5c7c98c1 100644 (file)
--- 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 7593270c31ceace18415fb7ed443abc383ca381a..89b014d148de54bd6af2b2bea70d846f84956189 100644 (file)
--- 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 6b6976a2b21aece2a1ca7389dde3317c227a3170..3c8d7940a1239e86774b8e255ec460e4d82fe99b 100644 (file)
--- 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 bce9e437313f1d4d75628614fc11353d58a898dc..3fedbbb5695cbaa14ab620d6eb400fc7b142a8f5 100644 (file)
--- 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 0b9557d0bed12f4d70c5c8a6c6c7b45662df1b5c..a6b120e4a5dfcd7f2dff3bbd9a6d49e41878dc3e 100644 (file)
--- 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 c5cc4e8f497182a8c86fcc6a422b374e18d14a8b..f009b589fc0bd55a2f089ae156528a1c5441c0df 100644 (file)
--- 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 f6a006df67dea7c1bdcbf795bf4c4413aa6aef30..4cb0a8f130239e6fb80ed09bdf5ab753910f82de 100644 (file)
--- 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 3e2b525e2fcb05c108852dbfcd75389d2e36e5a8..d0ea5329abc577291730b19c09a3b382c9004f6d 100644 (file)
--- 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 b12ec5b7b96a98cb92ddb37523db246d54c0892d..7bc6e3dee1409f0152b268d9f7c66e569a65ca5d 100644 (file)
--- 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 31a569d7bb601f9c0768679435376f24010b2564..c32b76a0ddcf80fd04ba50cf4d0575b3f643f0d6 100644 (file)
--- 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 ca00741f4538a112df1216d0f2e7a7ba9d354e3f..5a91d4ff952c0dc4ebe0314cc222575022e02554 100644 (file)
--- 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 a41b09de359a87c1723e40d9efec3d9e3df7dbd7..8c988fa81b4b8d424c0ede6c4e486604d3448ac6 100644 (file)
--- 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));