From: TimePath Date: Wed, 23 Dec 2015 08:39:21 +0000 (+1100) Subject: Share common inclusions X-Git-Tag: xonotic-v0.8.2~1456 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3b312bb304c29b070af6eff0448d8f1f7c5f7a5;p=xonotic%2Fxonotic-data.pk3dir.git Share common inclusions --- diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 2727db46e..75ca9ac13 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -25,37 +25,7 @@ #include "weapons/projectile.qc" // TODO -#include "../common/anim.qc" -#include "../common/animdecide.qc" -#include "../common/effects/effectinfo.qc" -#include "../common/ent_cs.qc" -#include "../common/mapinfo.qc" -#include "../common/movetypes/include.qc" -#include "../common/net_notice.qc" -#include "../common/notifications.qc" -#include "../common/physics.qc" -#include "../common/playerstats.qc" -#include "../common/util.qc" - -#include "../common/viewloc.qc" - -#include "../common/minigames/minigames.qc" -#include "../common/minigames/cl_minigames.qc" - -#include "../common/deathtypes/all.qc" -#include "../common/effects/all.qc" -#include "../common/gamemodes/all.qc" -#include "../common/impulses/all.qc" -#include "../common/items/all.qc" -#include "../common/monsters/all.qc" -#include "../common/mutators/all.qc" -#include "../common/turrets/all.qc" -#include "../common/vehicles/all.qc" -#include "../common/weapons/all.qc" - -#include "../common/turrets/cl_turrets.qc" - -#include "../common/triggers/include.qc" +#include "../common/_all.inc" #include "../lib/csqcmodel/cl_model.qc" #include "../lib/csqcmodel/cl_player.qc" diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc new file mode 100644 index 000000000..5b0339077 --- /dev/null +++ b/qcsrc/common/_all.inc @@ -0,0 +1,50 @@ +#ifndef MENUQC +#include "anim.qc" +#include "animdecide.qc" +#include "ent_cs.qc" +#include "net_notice.qc" +#endif + +#include "mapinfo.qc" +#include "playerstats.qc" +#include "util.qc" + +#ifndef CSQC +#include "campaign_file.qc" +#include "campaign_setup.qc" +#endif + +#ifndef MENUQC +#include "physics.qc" +#include "movetypes/include.qc" +#include "triggers/include.qc" +#include "viewloc.qc" +#endif + +#ifndef MENUQC +#include "minigames/minigames.qc" +#endif +#ifdef CSQC +#include "minigames/cl_minigames.qc" +#endif +#ifdef SVQC +#include "minigames/sv_minigames.qc" +#endif + +#include "debug.qh" + +#ifndef MENUQC +#include "deathtypes/all.qc" +#include "effects/all.qc" +#include "impulses/all.qc" +#include "notifications.qc" +#endif + +#include "items/all.qc" + #include "weapons/all.qc" + #include "monsters/all.qc" + #include "turrets/all.qc" + #include "vehicles/all.qc" + +#include "mutators/all.qc" + #include "gamemodes/all.qc" diff --git a/qcsrc/common/effects/all.qc b/qcsrc/common/effects/all.qc index 347a2111b..8c13a68f6 100644 --- a/qcsrc/common/effects/all.qc +++ b/qcsrc/common/effects/all.qc @@ -91,3 +91,5 @@ void Send_Effect_(string eff_name, vector eff_loc, vector eff_vel, int eff_cnt) __pointparticles(_particleeffectnum(eff_name), eff_loc, eff_vel, eff_cnt); } #endif + +#include "effectinfo.qc" diff --git a/qcsrc/common/monsters/all.qc b/qcsrc/common/monsters/all.qc index f5c973bd0..2b15e4085 100644 --- a/qcsrc/common/monsters/all.qc +++ b/qcsrc/common/monsters/all.qc @@ -18,4 +18,9 @@ string M_Model(string m_mdl) #include "all.inc" #undef IMPLEMENTATION +#ifdef SVQC +#include "spawn.qc" +#include "sv_monsters.qc" +#endif + #endif diff --git a/qcsrc/common/turrets/all.qc b/qcsrc/common/turrets/all.qc index bbd0d6811..2d40f17d0 100644 --- a/qcsrc/common/turrets/all.qc +++ b/qcsrc/common/turrets/all.qc @@ -9,3 +9,15 @@ REGISTER_NET_LINKED(ENT_CLIENT_TURRET) #define IMPLEMENTATION #include "all.inc" #undef IMPLEMENTATION + +#ifdef CSQC +#include "cl_turrets.qc" +#endif + +#ifdef SVQC +#include "sv_turrets.qc" +#include "config.qc" +#include "util.qc" +#include "checkpoint.qc" +#include "targettrigger.qc" +#endif diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 07ae75851..862697eb8 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -47,6 +47,9 @@ #ifndef MENUQC #include "calculations.qc" #endif +#ifdef SVQC + #include "config.qc" +#endif #define IMPLEMENTATION #include "all.inc" #undef IMPLEMENTATION diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc index 730fb652b..621c1a489 100644 --- a/qcsrc/menu/progs.inc +++ b/qcsrc/menu/progs.inc @@ -11,18 +11,7 @@ #include "xonotic/util.qc" -#include "../common/campaign_file.qc" -#include "../common/campaign_setup.qc" -#include "../common/mapinfo.qc" -#include "../common/playerstats.qc" -#include "../common/util.qc" -#include "../common/debug.qh" - -#include "../common/items/all.qc" -#include "../common/monsters/all.qc" -#include "../common/mutators/all.qc" -#include "../common/vehicles/all.qc" -#include "../common/weapons/all.qc" +#include "../common/_all.inc" #if BUILD_MOD #include "../../mod/menu/progs.inc" diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index 8bfab2052..cde4b68f9 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -53,45 +53,9 @@ #include "weapons/weaponstats.qc" #include "weapons/weaponsystem.qc" -#include "../common/anim.qc" -#include "../common/animdecide.qc" -#include "../common/campaign_file.qc" -#include "../common/campaign_setup.qc" -#include "../common/effects/effectinfo.qc" -#include "../common/ent_cs.qc" -#include "../common/mapinfo.qc" -#include "../common/minigames/minigames.qc" -#include "../common/minigames/sv_minigames.qc" -#include "../common/monsters/spawn.qc" -#include "../common/monsters/sv_monsters.qc" -#include "../common/movetypes/include.qc" -#include "../common/net_notice.qc" -#include "../common/notifications.qc" -#include "../common/physics.qc" -#include "../common/playerstats.qc" -#include "../common/triggers/include.qc" -#include "../common/util.qc" -#include "../common/viewloc.qc" - -#include "../common/deathtypes/all.qc" -#include "../common/effects/all.qc" -#include "../common/gamemodes/all.qc" -#include "../common/impulses/all.qc" -#include "../common/items/all.qc" -#include "../common/monsters/all.qc" -#include "../common/turrets/all.qc" -#include "../common/vehicles/all.qc" -#include "../common/weapons/all.qc" -#include "../common/mutators/all.qc" +#include "../common/_all.inc" #include "mutators/all.qc" -#include "../common/turrets/sv_turrets.qc" -#include "../common/turrets/config.qc" -#include "../common/turrets/util.qc" -#include "../common/turrets/checkpoint.qc" -#include "../common/turrets/targettrigger.qc" -#include "../common/weapons/config.qc" - #include "../lib/csqcmodel/sv_model.qc" #include "../lib/warpzone/anglestransform.qc"