From: otta8634 Date: Sun, 29 Dec 2024 14:57:49 +0000 (+0800) Subject: Remove lib/color.qh includes X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7083bc537ef780e2c718b59a9681ced0da097f7c;p=xonotic%2Fxonotic-data.pk3dir.git Remove lib/color.qh includes Unnecessary --- diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc index d72130c84..2b9d5e2f1 100644 --- a/qcsrc/common/items/item/ammo.qc +++ b/qcsrc/common/items/item/ammo.qc @@ -1,7 +1,6 @@ #include "ammo.qh" #ifdef MENUQC -#include #include METHOD(Ammo, describe, string(Ammo this)) diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc index 13045e38b..904686a7b 100644 --- a/qcsrc/common/items/item/armor.qc +++ b/qcsrc/common/items/item/armor.qc @@ -1,8 +1,6 @@ #include "armor.qh" #ifdef MENUQC -#include - METHOD(ArmorSmall, describe, string(ArmorSmall this)) { TC(ArmorSmall, this); diff --git a/qcsrc/common/items/item/health.qc b/qcsrc/common/items/item/health.qc index d9780fd9c..c74e478c1 100644 --- a/qcsrc/common/items/item/health.qc +++ b/qcsrc/common/items/item/health.qc @@ -1,8 +1,6 @@ #include "health.qh" #ifdef MENUQC -#include - METHOD(HealthSmall, describe, string(HealthSmall this)) { TC(HealthSmall, this); diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc index 69ef59aa0..75f9f1559 100644 --- a/qcsrc/common/items/item/jetpack.qc +++ b/qcsrc/common/items/item/jetpack.qc @@ -17,8 +17,6 @@ METHOD(JetpackRegen, m_spawnfunc_hookreplace, GameItem(JetpackRegen this, entity #endif #ifdef MENUQC -#include - METHOD(Jetpack, describe, string(Jetpack this)) { TC(Jetpack, this); diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc index 8b9d3a63d..99252869d 100644 --- a/qcsrc/common/mutators/mutator/buffs/all.inc +++ b/qcsrc/common/mutators/mutator/buffs/all.inc @@ -1,5 +1,3 @@ -#include - string Buff_CompatName(string buffname) { switch(buffname) diff --git a/qcsrc/common/mutators/mutator/instagib/items.qc b/qcsrc/common/mutators/mutator/instagib/items.qc index 123978291..7b6fa5aa1 100644 --- a/qcsrc/common/mutators/mutator/instagib/items.qc +++ b/qcsrc/common/mutators/mutator/instagib/items.qc @@ -1,7 +1,6 @@ #include "items.qh" #ifdef MENUQC -#include #include METHOD(VaporizerCells, describe, string(VaporizerCells this)) diff --git a/qcsrc/common/mutators/mutator/nades/all.inc b/qcsrc/common/mutators/mutator/nades/all.inc index 113fd307e..20addab92 100644 --- a/qcsrc/common/mutators/mutator/nades/all.inc +++ b/qcsrc/common/mutators/mutator/nades/all.inc @@ -1,5 +1,3 @@ -#include - #ifdef GAMEQC #define NADE_PROJECTILE(i, projectile, trail) MACRO_BEGIN \ this.m_projectile[i] = projectile; \ diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qc b/qcsrc/common/mutators/mutator/overkill/okhmg.qc index 57966de67..a35864da7 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qc +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qc @@ -156,7 +156,6 @@ METHOD(OverkillHeavyMachineGun, wr_impacteffect, void(entity thiswep, entity act #endif #ifdef MENUQC -#include #include #include "okmachinegun.qh" diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc index 762ed15b2..53da43bf0 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc @@ -156,7 +156,6 @@ METHOD(OverkillMachineGun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(OverkillMachineGun, describe, string(OverkillMachineGun this)) diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index 2d51d79a7..1a567aaa2 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -363,7 +363,6 @@ METHOD(OverkillNex, wr_zoomdir, bool(entity thiswep)) #endif #ifdef MENUQC -#include #include METHOD(OverkillNex, describe, string(OverkillNex this)) diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qc b/qcsrc/common/mutators/mutator/overkill/okrpc.qc index 2f707d1e2..70566f78e 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qc +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qc @@ -232,7 +232,6 @@ METHOD(OverkillRocketPropelledChainsaw, wr_impacteffect, void(entity thiswep, en #endif #ifdef MENUQC -#include #include METHOD(OverkillRocketPropelledChainsaw, describe, string(OverkillRocketPropelledChainsaw this)) diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc index 0826f236c..405cfadd3 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc @@ -121,7 +121,6 @@ METHOD(OverkillShotgun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(OverkillShotgun, describe, string(OverkillShotgun this)) diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc index b9e68c0e5..fa096b5fd 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qc @@ -43,8 +43,6 @@ METHOD(InvisibilityStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC -#include - METHOD(InvisibilityItem, describe, string(InvisibilityItem this)) { TC(InvisibilityItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc index ea71b6d1f..bfbc41433 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/shield.qc @@ -49,8 +49,6 @@ METHOD(ShieldStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC -#include - METHOD(ShieldItem, describe, string(ShieldItem this)) { TC(ShieldItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc index 5c8507e85..5e871367d 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qc @@ -31,8 +31,6 @@ METHOD(SpeedStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC -#include - METHOD(SpeedItem, describe, string(SpeedItem this)) { TC(SpeedItem, this); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc index 3340a15d4..be82b2b89 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc +++ b/qcsrc/common/mutators/mutator/powerups/powerup/strength.qc @@ -49,8 +49,6 @@ METHOD(StrengthStatusEffect, m_tick, void(StatusEffects this, entity actor)) } #endif #ifdef MENUQC -#include - METHOD(StrengthItem, describe, string(StrengthItem this)) { TC(StrengthItem, this); diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc index 3f4e72ea1..96d438e44 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc @@ -1,9 +1,7 @@ #include "bumblebee.qh" -#if defined(SVQC) +#ifdef SVQC #include -#elif defined(MENUQC) - #include #endif #ifdef GAMEQC diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index c53fdbd3e..ffd8c6060 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -1,10 +1,8 @@ #include "racer.qh" -#if defined(SVQC) +#ifdef SVQC #include #include -#elif defined(MENUQC) - #include #endif #ifdef GAMEQC diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc index 3f269fc05..20b8b1991 100644 --- a/qcsrc/common/vehicles/vehicle/raptor.qc +++ b/qcsrc/common/vehicles/vehicle/raptor.qc @@ -3,7 +3,6 @@ #if defined(SVQC) #include #elif defined(MENUQC) - #include #include "spiderbot.qh" #endif diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc index 3d53717a1..fc54275ad 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot.qc +++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc @@ -3,7 +3,6 @@ #if defined(SVQC) #include #elif defined(MENUQC) - #include #include "raptor.qh" #endif diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index 9ccaa832e..ea5a79d59 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -1510,7 +1510,6 @@ NET_HANDLE(ENT_CLIENT_ARC_BEAM, bool isnew) #endif #ifdef MENUQC -#include #include METHOD(Arc, describe, string(Arc this)) diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc index 79156bbc6..1d4c3c9bc 100644 --- a/qcsrc/common/weapons/weapon/blaster.qc +++ b/qcsrc/common/weapons/weapon/blaster.qc @@ -153,7 +153,6 @@ METHOD(Blaster, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include METHOD(Blaster, describe, string(Blaster this)) { diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc index 536e09d45..0e1adfe79 100644 --- a/qcsrc/common/weapons/weapon/crylink.qc +++ b/qcsrc/common/weapons/weapon/crylink.qc @@ -629,7 +629,6 @@ METHOD(Crylink, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(Crylink, describe, string(Crylink this)) diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index 1550ca031..a216e7bd1 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -607,7 +607,6 @@ METHOD(Devastator, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include #include "vortex.qh" diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index 44e8f49ca..04bb7efc9 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -776,7 +776,6 @@ METHOD(Electro, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(Electro, describe, string(Electro this)) diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc index c924dde14..b1c634e2a 100644 --- a/qcsrc/common/weapons/weapon/fireball.qc +++ b/qcsrc/common/weapons/weapon/fireball.qc @@ -434,7 +434,6 @@ METHOD(Fireball, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include METHOD(Fireball, describe, string(Fireball this)) { diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc index 8e268ed55..b47d17d4d 100644 --- a/qcsrc/common/weapons/weapon/hagar.qc +++ b/qcsrc/common/weapons/weapon/hagar.qc @@ -497,7 +497,6 @@ METHOD(Hagar, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(Hagar, describe, string(Hagar this)) diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 645df616f..996669e1d 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -227,7 +227,6 @@ METHOD(HLAC, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include #include "blaster.qh" diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc index 21f22c15a..890f0c10a 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -511,7 +511,6 @@ NET_HANDLE(ENT_CLIENT_HOOK, bool bIsNew) // TODO: hook: temporarily transform this.origin for drawing the model along warpzones! #endif #ifdef MENUQC -#include #include METHOD(Hook, describe, string(Hook this)) diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index 500dfad98..5435b4c76 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -413,7 +413,6 @@ METHOD(MachineGun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(MachineGun, describe, string(MachineGun this)) diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index e98c393d6..ad6408457 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -513,7 +513,6 @@ METHOD(MineLayer, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(MineLayer, describe, string(MineLayer this)) diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc index d93dcec85..24d0099f0 100644 --- a/qcsrc/common/weapons/weapon/mortar.qc +++ b/qcsrc/common/weapons/weapon/mortar.qc @@ -373,7 +373,6 @@ METHOD(Mortar, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(Mortar, describe, string(Mortar this)) diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index 4ba376e34..ea1673c77 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -424,7 +424,6 @@ METHOD(PortoLaunch, wr_impacteffect, void(entity this, entity actor)) { #endif #ifdef MENUQC -#include METHOD(PortoLaunch, describe, string(PortoLaunch this)) { diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index 022545e35..99df93e5f 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -260,7 +260,6 @@ METHOD(Rifle, wr_zoomdir, bool(entity thiswep)) #endif #ifdef MENUQC -#include #include #include "vortex.qh" diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index 5e4574312..df34e3d39 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -680,7 +680,6 @@ METHOD(Seeker, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(Seeker, describe, string(Seeker this)) diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index 379e316cb..6b6c141c4 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -814,7 +814,6 @@ METHOD(Shockwave, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include "shotgun.qh" METHOD(Shockwave, describe, string(Shockwave this)) diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index 7eca72d2a..4d183f551 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -386,7 +386,6 @@ METHOD(Shotgun, wr_impacteffect, void(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include METHOD(Shotgun, describe, string(Shotgun this)) diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index 81426c7cd..0566aac87 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -594,7 +594,6 @@ PRECACHE(Tuba) #endif #ifdef MENUQC -#include METHOD(Tuba, describe, string(Tuba this)) { diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 4c048278d..2d0dd83fc 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -408,7 +408,6 @@ METHOD(Vaporizer, wr_zoom, bool(entity thiswep, entity actor)) #endif #ifdef MENUQC -#include #include #include #include "blaster.qh" diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index 370cdf32f..ce5e8a3fc 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -354,7 +354,6 @@ METHOD(Vortex, wr_zoomdir, bool(entity thiswep)) #endif #ifdef MENUQC -#include #include #include "rifle.qh"