From 4031eeee994424525fb5632537b0a30b61cf3b5c Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 22 Feb 2015 19:57:24 +1100 Subject: [PATCH] Move QC movetypes to common folder --- qcsrc/client/casings.qc | 2 +- qcsrc/client/damage.qc | 2 +- qcsrc/client/progs.src | 2 +- qcsrc/client/vehicles/vehicles.qc | 2 +- qcsrc/{client => common}/movetypes.qc | 8 ++++---- qcsrc/{client => common}/movetypes.qh | 0 qcsrc/common/nades.qc | 2 +- qcsrc/common/triggers/trigger/jumppads.qc | 2 +- qcsrc/common/weapons/weapons.qc | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/mutators/gamemode_ctf.qc | 2 +- qcsrc/server/progs.src | 3 +-- qcsrc/server/t_items.qc | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) rename qcsrc/{client => common}/movetypes.qc (99%) rename qcsrc/{client => common}/movetypes.qh (100%) diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc index 6068a799f..7688e242d 100644 --- a/qcsrc/client/casings.qc +++ b/qcsrc/client/casings.qc @@ -1,5 +1,5 @@ #if defined(CSQC) - #include "movetypes.qh" + #include "../common/movetypes.qh" #include "prandom.qh" #include "rubble.qh" diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc index c3d260863..fb3c64589 100644 --- a/qcsrc/client/damage.qc +++ b/qcsrc/client/damage.qc @@ -7,7 +7,7 @@ #include "autocvars.qh" #include "../common/deathtypes.qh" #include "damage.qh" - #include "movetypes.qh" + #include "../common/movetypes.qh" #include "prandom.qh" #include "vehicles/vehicles.qh" #elif defined(MENUQC) diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index 098fbbdd5..ff8632cc9 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -17,7 +17,6 @@ main.qc mapvoting.qc miscfunctions.qc modeleffects.qc -movetypes.qc noise.qc particles.qc player_skeleton.qc @@ -41,6 +40,7 @@ weapons/projectile.qc // TODO ../common/animdecide.qc ../common/buffs.qc ../common/mapinfo.qc +../common/movetypes.qc ../common/nades.qc ../common/net_notice.qc ../common/notifications.qc diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc index 290385e49..81bdc801d 100644 --- a/qcsrc/client/vehicles/vehicles.qc +++ b/qcsrc/client/vehicles/vehicles.qc @@ -6,7 +6,7 @@ #include "../../common/util.qh" #include "../../common/buffs.qh" #include "../autocvars.qh" - #include "../movetypes.qh" + #include "../../common/movetypes.qh" #include "../prandom.qh" #include "../main.qh" #include "vehicles.qh" diff --git a/qcsrc/client/movetypes.qc b/qcsrc/common/movetypes.qc similarity index 99% rename from qcsrc/client/movetypes.qc rename to qcsrc/common/movetypes.qc index 916e6e0bd..7109b0eca 100644 --- a/qcsrc/client/movetypes.qc +++ b/qcsrc/common/movetypes.qc @@ -1,10 +1,10 @@ -#include "../common/physics.qh" +#include "physics.qh" #if defined(CSQC) #include "../dpdefs/csprogsdefs.qh" - #include "defs.qh" - #include "../common/stats.qh" - #include "../common/util.qh" + #include "../client/defs.qh" + #include "stats.qh" + #include "util.qh" #include "movetypes.qh" #include "../csqcmodellib/common.qh" #include "../server/t_items.qh" diff --git a/qcsrc/client/movetypes.qh b/qcsrc/common/movetypes.qh similarity index 100% rename from qcsrc/client/movetypes.qh rename to qcsrc/common/movetypes.qh diff --git a/qcsrc/common/nades.qc b/qcsrc/common/nades.qc index 4225a19f0..855efff12 100644 --- a/qcsrc/common/nades.qc +++ b/qcsrc/common/nades.qc @@ -3,7 +3,7 @@ #include "../client/defs.qh" #include "nades.qh" #include "buffs.qh" - #include "../client/movetypes.qh" + #include "../common/movetypes.qh" #include "../server/tturrets/include/turrets_early.qh" #include "../client/main.qh" #include "../csqcmodellib/cl_model.qh" diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc index adf62cf2a..4c33de568 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qc +++ b/qcsrc/common/triggers/trigger/jumppads.qc @@ -1,7 +1,7 @@ // TODO: split target_push and put it in the target folder #ifdef SVQC #include "jumppads.qh" -#include "../../../client/movetypes.qh" +#include "../../movetypes.qh" void trigger_push_use() { diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc index 55fcc0e14..ea04ce145 100644 --- a/qcsrc/common/weapons/weapons.qc +++ b/qcsrc/common/weapons/weapons.qc @@ -17,7 +17,7 @@ #include "../../client/autocvars.qh" #include "../deathtypes.qh" #include "../../csqcmodellib/interpolate.qh" - #include "../../client/movetypes.qh" + #include "../movetypes.qh" #include "../../client/main.qh" #include "../../csqcmodellib/cl_model.qh" #elif defined(MENUQC) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index eb784f679..af1cdefd4 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -25,7 +25,7 @@ #include "g_hook.qh" #include "scores.qh" #include "spawnpoints.qh" - #include "../client/movetypes.qh" + #include "../common/movetypes.qh" #endif float Damage_DamageInfo_SendEntity(entity to, float sf) diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index a040bff12..5295dbb9b 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -1,4 +1,4 @@ -#include "../../client/movetypes.qh" +#include "../../common/movetypes.qh" void ctf_FakeTimeLimit(entity e, float t) { diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index d407a4d66..f1d38384a 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -74,8 +74,6 @@ weapons/tracing.qc weapons/weaponstats.qc weapons/weaponsystem.qc -../client/movetypes.qc - ../common/animdecide.qc ../common/buffs.qc ../common/campaign_file.qc @@ -87,6 +85,7 @@ weapons/weaponsystem.qc ../common/monsters/monsters.qc ../common/monsters/spawn.qc ../common/monsters/sv_monsters.qc +../common/movetypes.qc ../common/nades.qc ../common/net_notice.qc ../common/notifications.qc diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index ba0ee4410..143d7dc09 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -4,7 +4,7 @@ #include "../common/buffs.qh" #include "../common/weapons/weapons.qh" #include "../client/autocvars.qh" - #include "../client/movetypes.qh" + #include "../common/movetypes.qh" #include "../client/main.qh" #include "../csqcmodellib/common.qh" #include "../csqcmodellib/cl_model.qh" -- 2.39.2