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 16bfcd57d20ac16caa823f39d6a4d2e217dc9649..85120eff24bc875695ff2fe68ef8b2dffebfb1b1 100644 (file)
--- 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 c67eb3207eb37c528f7e09a08273cfb332ca9601..2d9f0951954438bbae044e6b5138f58ad0334064 100644 (file)
--- 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 a0763390be7fe179070dc4e048b8f569c86ebce2..4594c90d971823dafc7c6efc8bc2c3249b5dd260 100644 (file)
--- 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 365a9e79d8f8d35d4b8a7ead0b28fb4fa901b583..f5c54b58eb942f276e6c4503463f193f352d0d15 100644 (file)
--- 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 ca887c63bb0d06af10635cd28d1bfe9f4f3c0707..a5d89f50bb6035f5f8832869729a94da146fa368 100644 (file)
--- 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 e56f3c256ea5d44ef7c5e864acd2c31c61ae6541..6c6675e113f14b6ca5645f4d3e34a094f482a4ee 100644 (file)
--- 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 c04e1f4b8b9239c9657223f19757d6821dd8a170..b93ab03d0a4ded5fcb90f76e2cef41c1963bb195 100644 (file)
--- 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 7f1bb892c3e254ed538ec1ce87e748f9203e4f65..b99332b984533c9853a79b0618c859e4c5a78eff 100644 (file)
--- 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"