From d22c6120af8d0f5e794bde4c4c68a76ad23e3445 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 10 Jun 2013 01:33:06 -0400 Subject: [PATCH] Working on moving the weapon files to proper directories (plus cleanup) --- qcsrc/client/progs.src | 2 +- qcsrc/common/items.qh | 2 +- qcsrc/{server => common/weapons}/w_all.qc | 0 qcsrc/{server => common/weapons}/w_crylink.qc | 0 qcsrc/{server => common/weapons}/w_electro.qc | 0 qcsrc/{server => common/weapons}/w_electro.qh | 0 qcsrc/{server => common/weapons}/w_fireball.qc | 0 .../{server => common/weapons}/w_grenadelauncher.qc | 0 qcsrc/{server => common/weapons}/w_hagar.qc | 0 qcsrc/{server => common/weapons}/w_hlac.qc | 0 qcsrc/{server => common/weapons}/w_hook.qc | 0 qcsrc/{server => common/weapons}/w_laser.qc | 0 qcsrc/{server => common/weapons}/w_lightning.qc | 0 qcsrc/{server => common/weapons}/w_lightning.qh | 0 qcsrc/{server => common/weapons}/w_minelayer.qc | 0 qcsrc/{server => common/weapons}/w_minstanex.qc | 0 qcsrc/{server => common/weapons}/w_nex.qc | 0 qcsrc/{server => common/weapons}/w_porto.qc | 0 qcsrc/{server => common/weapons}/w_rifle.qc | 0 qcsrc/{server => common/weapons}/w_rocketlauncher.qc | 0 qcsrc/{server => common/weapons}/w_seeker.qc | 0 qcsrc/{server => common/weapons}/w_shotgun.qc | 0 qcsrc/{server => common/weapons}/w_tuba.qc | 0 qcsrc/{server => common/weapons}/w_uzi.qc | 0 qcsrc/server/progs.src | 12 ++++++------ qcsrc/server/{ => weapons}/cl_weapons.qc | 0 qcsrc/server/{ => weapons}/cl_weaponsystem.qc | 0 qcsrc/server/{ => weapons}/w_common.qc | 0 28 files changed, 8 insertions(+), 8 deletions(-) rename qcsrc/{server => common/weapons}/w_all.qc (100%) rename qcsrc/{server => common/weapons}/w_crylink.qc (100%) rename qcsrc/{server => common/weapons}/w_electro.qc (100%) rename qcsrc/{server => common/weapons}/w_electro.qh (100%) rename qcsrc/{server => common/weapons}/w_fireball.qc (100%) rename qcsrc/{server => common/weapons}/w_grenadelauncher.qc (100%) rename qcsrc/{server => common/weapons}/w_hagar.qc (100%) rename qcsrc/{server => common/weapons}/w_hlac.qc (100%) rename qcsrc/{server => common/weapons}/w_hook.qc (100%) rename qcsrc/{server => common/weapons}/w_laser.qc (100%) rename qcsrc/{server => common/weapons}/w_lightning.qc (100%) rename qcsrc/{server => common/weapons}/w_lightning.qh (100%) rename qcsrc/{server => common/weapons}/w_minelayer.qc (100%) rename qcsrc/{server => common/weapons}/w_minstanex.qc (100%) rename qcsrc/{server => common/weapons}/w_nex.qc (100%) rename qcsrc/{server => common/weapons}/w_porto.qc (100%) rename qcsrc/{server => common/weapons}/w_rifle.qc (100%) rename qcsrc/{server => common/weapons}/w_rocketlauncher.qc (100%) rename qcsrc/{server => common/weapons}/w_seeker.qc (100%) rename qcsrc/{server => common/weapons}/w_shotgun.qc (100%) rename qcsrc/{server => common/weapons}/w_tuba.qc (100%) rename qcsrc/{server => common/weapons}/w_uzi.qc (100%) rename qcsrc/server/{ => weapons}/cl_weapons.qc (100%) rename qcsrc/server/{ => weapons}/cl_weaponsystem.qc (100%) rename qcsrc/server/{ => weapons}/w_common.qc (100%) diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index 3b8aa1bac..e409f7749 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -106,7 +106,7 @@ noise.qc ../common/command/generic.qc ../common/mapinfo.qc ../common/items.qc -../server/w_all.qc +../server/weapons/w_all.qc ../common/explosion_equation.qc ../common/urllib.qc command/cl_cmd.qc diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh index ba42d55ac..be17042aa 100644 --- a/qcsrc/common/items.qh +++ b/qcsrc/common/items.qh @@ -228,7 +228,7 @@ WEPSET_DECLARE_A(WEPBIT_SUPERWEAPONS); REGISTER_WEAPON_2(WEP_##id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) #endif -#include "../server/w_all.qc" +#include "../server/weapons/w_all.qc" #undef REGISTER_WEAPON ACCUMULATE_FUNCTION(RegisterWeapons, register_weapons_done) diff --git a/qcsrc/server/w_all.qc b/qcsrc/common/weapons/w_all.qc similarity index 100% rename from qcsrc/server/w_all.qc rename to qcsrc/common/weapons/w_all.qc diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc similarity index 100% rename from qcsrc/server/w_crylink.qc rename to qcsrc/common/weapons/w_crylink.qc diff --git a/qcsrc/server/w_electro.qc b/qcsrc/common/weapons/w_electro.qc similarity index 100% rename from qcsrc/server/w_electro.qc rename to qcsrc/common/weapons/w_electro.qc diff --git a/qcsrc/server/w_electro.qh b/qcsrc/common/weapons/w_electro.qh similarity index 100% rename from qcsrc/server/w_electro.qh rename to qcsrc/common/weapons/w_electro.qh diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc similarity index 100% rename from qcsrc/server/w_fireball.qc rename to qcsrc/common/weapons/w_fireball.qc diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/common/weapons/w_grenadelauncher.qc similarity index 100% rename from qcsrc/server/w_grenadelauncher.qc rename to qcsrc/common/weapons/w_grenadelauncher.qc diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc similarity index 100% rename from qcsrc/server/w_hagar.qc rename to qcsrc/common/weapons/w_hagar.qc diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc similarity index 100% rename from qcsrc/server/w_hlac.qc rename to qcsrc/common/weapons/w_hlac.qc diff --git a/qcsrc/server/w_hook.qc b/qcsrc/common/weapons/w_hook.qc similarity index 100% rename from qcsrc/server/w_hook.qc rename to qcsrc/common/weapons/w_hook.qc diff --git a/qcsrc/server/w_laser.qc b/qcsrc/common/weapons/w_laser.qc similarity index 100% rename from qcsrc/server/w_laser.qc rename to qcsrc/common/weapons/w_laser.qc diff --git a/qcsrc/server/w_lightning.qc b/qcsrc/common/weapons/w_lightning.qc similarity index 100% rename from qcsrc/server/w_lightning.qc rename to qcsrc/common/weapons/w_lightning.qc diff --git a/qcsrc/server/w_lightning.qh b/qcsrc/common/weapons/w_lightning.qh similarity index 100% rename from qcsrc/server/w_lightning.qh rename to qcsrc/common/weapons/w_lightning.qh diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc similarity index 100% rename from qcsrc/server/w_minelayer.qc rename to qcsrc/common/weapons/w_minelayer.qc diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc similarity index 100% rename from qcsrc/server/w_minstanex.qc rename to qcsrc/common/weapons/w_minstanex.qc diff --git a/qcsrc/server/w_nex.qc b/qcsrc/common/weapons/w_nex.qc similarity index 100% rename from qcsrc/server/w_nex.qc rename to qcsrc/common/weapons/w_nex.qc diff --git a/qcsrc/server/w_porto.qc b/qcsrc/common/weapons/w_porto.qc similarity index 100% rename from qcsrc/server/w_porto.qc rename to qcsrc/common/weapons/w_porto.qc diff --git a/qcsrc/server/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc similarity index 100% rename from qcsrc/server/w_rifle.qc rename to qcsrc/common/weapons/w_rifle.qc diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/common/weapons/w_rocketlauncher.qc similarity index 100% rename from qcsrc/server/w_rocketlauncher.qc rename to qcsrc/common/weapons/w_rocketlauncher.qc diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc similarity index 100% rename from qcsrc/server/w_seeker.qc rename to qcsrc/common/weapons/w_seeker.qc diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc similarity index 100% rename from qcsrc/server/w_shotgun.qc rename to qcsrc/common/weapons/w_shotgun.qc diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc similarity index 100% rename from qcsrc/server/w_tuba.qc rename to qcsrc/common/weapons/w_tuba.qc diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/common/weapons/w_uzi.qc similarity index 100% rename from qcsrc/server/w_uzi.qc rename to qcsrc/common/weapons/w_uzi.qc diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index 5b9c5917c..cf969eb4b 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -76,8 +76,8 @@ playerstats.qh portals.qh g_hook.qh -w_electro.qh -w_lightning.qh +weapons/w_electro.qh +weapons/w_lightning.qh scores.qh @@ -138,13 +138,13 @@ g_models.qc item_key.qc secret.qc -cl_weaponsystem.qc -w_common.qc +weapons/cl_weaponsystem.qc +weapons/w_common.qc -w_all.qc +weapons/w_all.qc t_items.qc -cl_weapons.qc +weapons/cl_weapons.qc cl_impulse.qc ent_cs.qc diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/weapons/cl_weapons.qc similarity index 100% rename from qcsrc/server/cl_weapons.qc rename to qcsrc/server/weapons/cl_weapons.qc diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/weapons/cl_weaponsystem.qc similarity index 100% rename from qcsrc/server/cl_weaponsystem.qc rename to qcsrc/server/weapons/cl_weaponsystem.qc diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/weapons/w_common.qc similarity index 100% rename from qcsrc/server/w_common.qc rename to qcsrc/server/weapons/w_common.qc -- 2.39.2