From: Samual Lenks <samual@xonotic.org>
Date: Tue, 11 Jun 2013 00:18:21 +0000 (-0400)
Subject: Remove individual weapon.qh files, make it compile
X-Git-Tag: xonotic-v0.8.0~152^2~396
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75483f7486e1e15aceeeffbae1e1b9608926379b;p=xonotic%2Fxonotic-data.pk3dir.git

Remove individual weapon.qh files, make it compile
---

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index c12f30847..c536ca63d 100644
--- 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 e4b7230d6..4612da764 100644
--- 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
index 57d6ceb0d..000000000
--- 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 bfd9ebec8..319e555e2 100644
--- 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
index 98c0be13e..000000000
--- 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 fd586c3d2..9cd064845 100644
--- 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