From: Mario <zacjardine@y7mail.com>
Date: Sun, 12 Jul 2015 02:45:59 +0000 (+1000)
Subject: Apply some minor updates from recent code cleanups
X-Git-Tag: xonotic-v0.8.1~38^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8018d31cf40eadadfadfad602edd726d137866b;p=xonotic%2Fxonotic-data.pk3dir.git

Apply some minor updates from recent code cleanups
---

diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc
index 16bfcd57d..85120eff2 100644
--- a/qcsrc/common/triggers/func/breakable.qc
+++ b/qcsrc/common/triggers/func/breakable.qc
@@ -1,7 +1,15 @@
 #ifdef SVQC
-#include "../../../server/weapons/common.qh"
+
 #include "../../../server/_all.qh"
 
+#include "../../../server/g_subs.qh"
+#include "../../../server/waypointsprites.qh"
+#include "../../../server/g_damage.qh"
+#include "../../../server/bot/bot.qh"
+#include "../../common/csqcmodel_settings.qh"
+#include "../../../csqcmodellib/sv_model.qh"
+#include "../../../server/weapons/common.qh"
+
 .entity sprite;
 
 .float dmg;
diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index c67eb3207..2d9f09519 100644
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -1,5 +1,5 @@
 #if defined(CSQC)
-	#include "../../../dpdefs/csprogsdefs.qh"
+	#include "../../../client/_all.qh"
 	#include "../../buffs.qh"
 	#include "../../../csqcmodellib/interpolate.qh"
 	#include "../../../client/main.qh"
@@ -269,14 +269,15 @@ void spawnfunc_misc_laser()
 // a laser goes from origin in direction angles
 // it has color 'colormod'
 // and stops when something is in the way
-.int cnt; // end effect
-.vector colormod;
-.int state; // on-off
-.int count; // flags for the laser
-.vector velocity;
-.float alpha;
-.float scale; // scaling factor of the thickness
-.float modelscale; // scaling factor of the dlight
+entityclass(Laser);
+class(Laser) .int cnt; // end effect
+class(Laser) .vector colormod;
+class(Laser) .int state; // on-off
+class(Laser) .int count; // flags for the laser
+class(Laser) .vector velocity;
+class(Laser) .float alpha;
+class(Laser) .float scale; // scaling factor of the thickness
+class(Laser) .float modelscale; // scaling factor of the dlight
 
 void Draw_Laser()
 {
diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index a0763390b..4594c90d9 100644
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -1,9 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../../dpdefs/progsdefs.qh"
-    #include "../../../dpdefs/dpextensions.qh"
     #include "../../../server/_all.qh"
+    #include "../../constants.qh"
     #include "../../../server/constants.qh"
     #include "../../../server/defs.qh"
 #endif
diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index 365a9e79d..f5c54b58e 100644
--- a/qcsrc/common/triggers/target/spawn.qc
+++ b/qcsrc/common/triggers/target/spawn.qc
@@ -1,10 +1,9 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../../dpdefs/progsdefs.qh"
-    #include "../../../dpdefs/dpextensions.qh"
+	#include "../../../server/_all.qh"
     #include "../../util.qh"
-    #include "../../../server/_all.qh"
+    #include "../../../server/defs.qh"
 #endif
 
 #ifdef SVQC
diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index ca887c63b..a5d89f50b 100644
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -3,13 +3,13 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
+	#include "../../server/_all.qh"
     #include "../../warpzonelib/common.qh"
     #include "../../warpzonelib/util_server.qh"
     #include "../../warpzonelib/server.qh"
     #include "../constants.qh"
 	#include "../triggers/subs.qh"
     #include "../util.qh"
-    #include "../../server/_all.qh"
     #include "../../server/weapons/csqcprojectile.qh"
     #include "../../server/autocvars.qh"
     #include "../../server/constants.qh"
diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index e56f3c256..6c6675e11 100644
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -1,8 +1,8 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
+#include "../../../server/_all.qh"
 #include "jumppads.qh"
 #include "../../movetypes/movetypes.qh"
-#include "../../../server/_all.qh"
 
 void trigger_push_use()
 {
diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index c04e1f4b8..b93ab03d0 100644
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -1,9 +1,9 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../../dpdefs/progsdefs.qh"
+	#include "../../../server/_all.qh"
     #include "../../util.qh"
-    #include "../../../server/_all.qh"
+    #include "../../../server/defs.qh"
     #include "secret.qh"
 #endif
 
diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc
index 7f1bb892c..b99332b98 100644
--- a/qcsrc/common/triggers/trigger/swamp.qc
+++ b/qcsrc/common/triggers/trigger/swamp.qc
@@ -2,7 +2,6 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
 	#include "../../../server/_all.qh"
-	#include "../../../dpdefs/progsdefs.qh"
     #include "../../../warpzonelib/util_server.qh"
     #include "../../weapons/all.qh"
     #include "../../../server/defs.qh"