Remove individual weapon.qh files, make it compile

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index c12f308475eb3868fbdeccf81928de370923a8a7..c536ca63dcf043d61eba9e56903512fddedd93e5 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -52,7 +52,7 @@ vehicles/vehicles.qh
 ../csqcmodellib/common.qh
 ../csqcmodellib/cl_model.qh
 ../csqcmodellib/cl_player.qh
-projectile.qh
+weapons/projectile.qh // TODO
 player_skeleton.qh
 
 sortlist.qc
@@ -71,7 +71,7 @@ rubble.qc
 hook.qc
 particles.qc
 laser.qc
-projectile.qc
+weapons/projectile.qc // TODO
 gibs.qc
 damage.qc
 casings.qc

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index e4b7230d629d99c7a7589237c444b3b642ff7afb..4612da7643389f2c66f329eee88c9cb0ab5d5b2a 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -10,6 +10,11 @@ REGISTER_WEAPON(
 /* shortname */ "lightning",
 /* fullname  */ _("Lightning")
 );
+
+#ifdef SVQC
+void LightningInit();
+vector lightning_shotorigin[4];
+#endif
 #else
 #ifdef SVQC
 

diff --git a/qcsrc/common/weapons/w_arc.qh b/qcsrc/common/weapons/w_arc.qh
deleted file mode 100644 (file)
index 57d6ceb..0000000
--- a/qcsrc/common/weapons/w_arc.qh
+++ /dev/null
@@ -1,2 +0,0 @@
-void LightningInit();
-vector lightning_shotorigin[4];

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index bfd9ebec8885a3165e520dbd495e4b5e52c025a2..319e555e2812c78a940aa292b994b48de35644a9 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -10,6 +10,11 @@ REGISTER_WEAPON(
 /* shortname */ "electro",
 /* fullname  */ _("Electro")
 );
+
+#ifdef SVQC
+void ElectroInit();
+vector electro_shotorigin[4];
+#endif
 #else
 #ifdef SVQC
 .float electro_count;

diff --git a/qcsrc/common/weapons/w_electro.qh b/qcsrc/common/weapons/w_electro.qh
deleted file mode 100644 (file)
index 98c0be1..0000000
--- a/qcsrc/common/weapons/w_electro.qh
+++ /dev/null
@@ -1,2 +0,0 @@
-void ElectroInit();
-vector electro_shotorigin[4];

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index fd586c3d2e5f718c658f032c4f51f85579f9afce..9cd064845b630f25c8a7693106728f625bdd5734 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -61,7 +61,7 @@ command/getreplies.qh
 command/cmd.qh
 command/sv_cmd.qh
 
-accuracy.qh
+weapons/accuracy.qh
 weapons/csqcprojectile.qh // TODO
 ../common/csqcmodel_settings.qh
 ../csqcmodellib/common.qh
@@ -74,9 +74,7 @@ playerstats.qh
 
 portals.qh
 
-g_hook.qh
-../common/weapons/electro.qh // TODO
-../common/weapons/arc.qh
+g_hook.qh // TODO
 
 scores.qh
 
@@ -153,6 +151,8 @@ cl_client.qc
 t_plats.qc
 antilag.qc
 
+weapons/accuracy.qc // TODO
+
 //ctf.qc
 //domination.qc
 //mode_onslaught.qc
@@ -206,8 +206,6 @@ target_spawn.qc
 func_breakable.qc
 target_music.qc
 
-
-accuracy.qc
 ../csqcmodellib/sv_model.qc
 
 playerdemo.qc