From: Mario <mario@smbclan.net>
Date: Wed, 23 Dec 2015 08:55:56 +0000 (+1000)
Subject: Fix compile
X-Git-Tag: xonotic-v0.8.2~1453
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e57480382bd4cdd42b6fbe16fb72f31d136668a1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compile
---

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 83c3f448a..7ebc11fe6 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -2,7 +2,7 @@
 #include "player_skeleton.qh"
 #include "weapons/projectile.qh"
 #include "../common/animdecide.qh"
-#include "../common/movetypes/movetypes.qh"
+#include "../common/physics/movetypes/movetypes.qh"
 #include "../common/viewloc.qh"
 #include "../lib/csqcmodel/cl_model.qh"
 #include "../lib/csqcmodel/cl_player.qh"
diff --git a/qcsrc/client/t_items.qc b/qcsrc/client/t_items.qc
index b0e1315f6..097f546ee 100644
--- a/qcsrc/client/t_items.qc
+++ b/qcsrc/client/t_items.qc
@@ -1,5 +1,5 @@
 
-#include "../common/movetypes/movetypes.qh"
+#include "../common/physics/movetypes/movetypes.qh"
 #include "../common/weapons/all.qh"
 #include "../lib/csqcmodel/cl_model.qh"
 #include "../lib/csqcmodel/common.qh"
diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 83505237d..cdeb247e7 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -14,7 +14,7 @@
 #include "../common/debug.qh"
 #include "../common/mapinfo.qh"
 #include "../common/gamemodes/all.qh"
-#include "../common/physics.qh"
+#include "../common/physics/player.qh"
 #include "../common/stats.qh"
 #include "../common/triggers/target/music.qh"
 #include "../common/teams.qh"
diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 04d728480..48f02c4fe 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -6,7 +6,7 @@
 #include "../mutators/events.qh"
 
 #include "../../common/constants.qh"
-#include "../../common/movetypes/movetypes.qh"
+#include "../../common/physics/movetypes/movetypes.qh"
 
 #include "../../lib/csqcmodel/interpolate.qh"
 
diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc
index 739321789..5d8a87d28 100644
--- a/qcsrc/common/effects/qc/casings.qc
+++ b/qcsrc/common/effects/qc/casings.qc
@@ -3,7 +3,7 @@
 #include "../../util.qh"
 
 #ifdef CSQC
-#include "../../movetypes/movetypes.qh"
+#include "../../physics/movetypes/movetypes.qh"
 #include "rubble.qh"
 #endif
 
diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index e77f63f69..2de4ef14c 100644
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -3,7 +3,7 @@
 
 #ifdef CSQC
 #include "../../deathtypes/all.qh"
-#include "../../movetypes/movetypes.qh"
+#include "../../physics/movetypes/movetypes.qh"
 #include "../../../client/mutators/events.qh"
 #include "../../vehicles/all.qh"
 #include "../../weapons/all.qh"
diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
index 19f47500e..2e248096b 100644
--- a/qcsrc/common/effects/qc/gibs.qc
+++ b/qcsrc/common/effects/qc/gibs.qc
@@ -59,7 +59,7 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker
 .bool silent;
 
 #include "rubble.qh"
-#include "../common/movetypes/movetypes.qh"
+#include "../common/physics/movetypes/movetypes.qh"
 
 .float scale;
 .float alpha;
diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index e949e3a0d..27e124674 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -7,6 +7,7 @@
     #include "../util.qh"
     #include "all.qh"
     #include "sv_monsters.qh"
+	#include "../physics/movelib.qh"
     #include "../weapons/all.qh"
     #include "../../server/autocvars.qh"
     #include "../../server/defs.qh"
@@ -710,7 +711,7 @@ void Monster_Move(float runspeed, float walkspeed, float stpspeed)
 		if(!(self.spawnflags & MONSTERFLAG_INVINCIBLE) && self.sprite)
 			WaypointSprite_UpdateHealth(self.sprite, self.health);
 
-		movelib_beak_simple(stpspeed);
+		movelib_brake_simple(stpspeed);
 		setanim(self, self.anim_idle, true, false, false);
 
 		self.enemy = world;
@@ -729,7 +730,7 @@ void Monster_Move(float runspeed, float walkspeed, float stpspeed)
 		if(!(self.spawnflags & MONSTERFLAG_INVINCIBLE) && self.sprite)
 			WaypointSprite_UpdateHealth(self.sprite, self.health);
 
-		movelib_beak_simple(stpspeed);
+		movelib_brake_simple(stpspeed);
 		setanim(self, self.anim_idle, true, false, false);
 
 		self.enemy = world;
@@ -798,7 +799,7 @@ void Monster_Move(float runspeed, float walkspeed, float stpspeed)
 		runspeed = walkspeed = 0;
 		if(time >= self.spawn_time)
 			setanim(self, self.anim_idle, true, false, false);
-		movelib_beak_simple(stpspeed);
+		movelib_brake_simple(stpspeed);
 		return;
 	}
 
@@ -879,7 +880,7 @@ void Monster_Move(float runspeed, float walkspeed, float stpspeed)
 		else if(e.target)
 			self.target2 = e.target;
 
-		movelib_beak_simple(stpspeed);
+		movelib_brake_simple(stpspeed);
 		if(time > self.anim_finished)
 		if(time > self.pain_finished)
 		if(!self.state)
@@ -1129,7 +1130,7 @@ void Monster_Move_2D(float mspeed, float allow_jumpoff)
 		mspeed = 0;
 		if(time >= self.spawn_time)
 			setanim(self, self.anim_idle, true, false, false);
-		movelib_beak_simple(0.6);
+		movelib_brake_simple(0.6);
 		return;
 	}
 
diff --git a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
index 194341383..887dcbf95 100644
--- a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
+++ b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
@@ -2,7 +2,7 @@
 #ifdef SVQC
 	#include "../../../../server/antilag.qh"
 #endif
-#include "../../../physics.qh"
+#include "../../../physics/player.qh"
 
 
 #if defined(SVQC)
diff --git a/qcsrc/common/mutators/mutator/dodging/dodging.qc b/qcsrc/common/mutators/mutator/dodging/dodging.qc
index d2debd8bf..053cdd739 100644
--- a/qcsrc/common/mutators/mutator/dodging/dodging.qc
+++ b/qcsrc/common/mutators/mutator/dodging/dodging.qc
@@ -33,7 +33,7 @@ bool autocvar_sv_dodging_sound;
 .float dodging_single_action;
 
 #include "../../../animdecide.qh"
-#include "../../../physics.qh"
+#include "../../../physics/player.qh"
 
 .float cvar_cl_dodging_timeout = _STAT(DODGING_TIMEOUT);
 
diff --git a/qcsrc/common/mutators/mutator/doublejump/doublejump.qc b/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
index a7aaa780f..a72644d9c 100644
--- a/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
+++ b/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
@@ -2,7 +2,7 @@
 #ifdef SVQC
 	#include "../../../../server/antilag.qh"
 #endif
-#include "../../../physics.qh"
+#include "../../../physics/player.qh"
 
 #ifdef SVQC
 REGISTER_MUTATOR(doublejump, autocvar_sv_doublejump);
diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qc b/qcsrc/common/mutators/mutator/multijump/multijump.qc
index 7a8b29218..eb5e64a40 100644
--- a/qcsrc/common/mutators/mutator/multijump/multijump.qc
+++ b/qcsrc/common/mutators/mutator/multijump/multijump.qc
@@ -2,7 +2,7 @@
 #ifdef SVQC
 	#include "../../../../server/antilag.qh"
 #endif
-#include "../../../physics.qh"
+#include "../../../physics/player.qh"
 
 
 #if defined(SVQC)
diff --git a/qcsrc/common/physics/all.inc b/qcsrc/common/physics/all.inc
index cea8df71e..182512061 100644
--- a/qcsrc/common/physics/all.inc
+++ b/qcsrc/common/physics/all.inc
@@ -1,3 +1,3 @@
 #include "player.qc"
 #include "movelib.qc"
-#include "movetypes/include.qc"
+#include "movetypes/all.inc"
diff --git a/qcsrc/common/physics/movelib.qc b/qcsrc/common/physics/movelib.qc
index acacba093..38afbe2d9 100644
--- a/qcsrc/common/physics/movelib.qc
+++ b/qcsrc/common/physics/movelib.qc
@@ -163,7 +163,7 @@ void movelib_update(vector dir,float force)
 }
 */
 
-void movelib_beak_simple(float force)
+void movelib_brake_simple(float force)
 {SELFPARAM();
     float mspeed;
     vector mdir;
diff --git a/qcsrc/common/physics/movelib.qh b/qcsrc/common/physics/movelib.qh
index 8a4bfd488..c1fd574ca 100644
--- a/qcsrc/common/physics/movelib.qh
+++ b/qcsrc/common/physics/movelib.qh
@@ -40,7 +40,7 @@ void movelib_move_simple(vector newdir,float velo,float blendrate)
 #define movelib_move_simple_gravity(newdir,velo,blendrate) \
     if(self.flags & FL_ONGROUND) movelib_move_simple(newdir,velo,blendrate)
 
-void movelib_beak_simple(float force);
+void movelib_brake_simple(float force);
 
 /**
 Pitches and rolls the entity to match the gound.
diff --git a/qcsrc/common/physics/movetypes/all.inc b/qcsrc/common/physics/movetypes/all.inc
new file mode 100644
index 000000000..322b3c4de
--- /dev/null
+++ b/qcsrc/common/physics/movetypes/all.inc
@@ -0,0 +1,7 @@
+#include "push.qc"
+#include "toss.qc"
+#include "walk.qc"
+#include "step.qc"
+#include "follow.qc"
+
+#include "movetypes.qc"
diff --git a/qcsrc/common/physics/movetypes/include.qc b/qcsrc/common/physics/movetypes/include.qc
deleted file mode 100644
index 322b3c4de..000000000
--- a/qcsrc/common/physics/movetypes/include.qc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "push.qc"
-#include "toss.qc"
-#include "walk.qc"
-#include "step.qc"
-#include "follow.qc"
-
-#include "movetypes.qc"
diff --git a/qcsrc/common/physics/movetypes/include.qh b/qcsrc/common/physics/movetypes/include.qh
deleted file mode 100644
index a96e5957a..000000000
--- a/qcsrc/common/physics/movetypes/include.qh
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MOVETYPES_INCLUDE_H
-#define MOVETYPES_INCLUDE_H
-
-#include "push.qh"
-#include "toss.qh"
-#include "walk.qh"
-
-#endif
diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index fc9396b30..fa169e9f8 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -1,16 +1,15 @@
-#include "include.qh"
-#include "../physics.qh"
+#include "../player.qh"
 
 #if defined(CSQC)
-	#include "../../client/defs.qh"
-	#include "../stats.qh"
-	#include "../util.qh"
+	#include "../../../client/defs.qh"
+	#include "../../stats.qh"
+	#include "../../util.qh"
 	#include "movetypes.qh"
-	#include "../../lib/csqcmodel/common.qh"
-	#include "../../server/t_items.qh"
+	#include "../../../lib/csqcmodel/common.qh"
+	#include "../../../server/t_items.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../server/autocvars.qh"
+	#include "../../../server/autocvars.qh"
 #endif
 
 void _Movetype_WallFriction(entity this, vector stepnormal)  // SV_WallFriction
diff --git a/qcsrc/common/physics/movetypes/push.qc b/qcsrc/common/physics/movetypes/push.qc
index b83246546..3b3c648f1 100644
--- a/qcsrc/common/physics/movetypes/push.qc
+++ b/qcsrc/common/physics/movetypes/push.qc
@@ -1,3 +1,5 @@
+#include "push.qh"
+
 void _Movetype_PushMove(entity this, float dt)  // SV_PushMove
 {
 	if (this.move_velocity == '0 0 0' && this.move_avelocity == '0 0 0')
diff --git a/qcsrc/common/physics/movetypes/toss.qc b/qcsrc/common/physics/movetypes/toss.qc
index 43b5a8a1a..44f8a9813 100644
--- a/qcsrc/common/physics/movetypes/toss.qc
+++ b/qcsrc/common/physics/movetypes/toss.qc
@@ -1,4 +1,5 @@
-#include "../physics.qh"
+#include "toss.qh"
+#include "../player.qh"
 
 void _Movetype_Physics_Toss(entity this, float dt)  // SV_Physics_Toss
 {
diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc
index e92624626..579a1cbaf 100644
--- a/qcsrc/common/physics/movetypes/walk.qc
+++ b/qcsrc/common/physics/movetypes/walk.qc
@@ -1,3 +1,5 @@
+#include "walk.qh"
+
 void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 {
 	vector stepnormal = '0 0 0';
diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 32c2fbfa8..68cae7395 100644
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -1,11 +1,11 @@
-#include "physics.qh"
-#include "triggers/include.qh"
-#include "viewloc.qh"
+#include "player.qh"
+#include "../triggers/include.qh"
+#include "../viewloc.qh"
 
 #ifdef SVQC
 
-#include "../server/miscfunctions.qh"
-#include "triggers/trigger/viewloc.qh"
+#include "../../server/miscfunctions.qh"
+#include "../triggers/trigger/viewloc.qh"
 
 // client side physics
 bool Physics_Valid(string thecvar)
diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index fc82c1320..4409e70ce 100644
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -247,7 +247,7 @@ REGISTER_STAT(TELEPORT_TELEFRAG_AVOID, int, autocvar_g_telefrags_avoid)
 REGISTER_STAT(SPECTATORSPEED, float)
 
 #ifdef SVQC
-#include "movetypes/movetypes.qh"
+#include "physics/movetypes/movetypes.qh"
 #endif
 
 REGISTER_STAT(MOVEVARS_AIRACCEL_QW_STRETCHFACTOR, float)
diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index 1f2f84a7d..d0b8f9459 100644
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -1,7 +1,7 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
 #include "jumppads.qh"
-#include "../../movetypes/movetypes.qh"
+#include "../../physics/movetypes/movetypes.qh"
 
 void trigger_push_use()
 {SELFPARAM();
diff --git a/qcsrc/common/turrets/turret/ewheel.qc b/qcsrc/common/turrets/turret/ewheel.qc
index 1d4647341..1757dea61 100644
--- a/qcsrc/common/turrets/turret/ewheel.qc
+++ b/qcsrc/common/turrets/turret/ewheel.qc
@@ -116,7 +116,7 @@ void ewheel_move_enemy()
     else
     {
         newframe = ewheel_anim_stop;
-        movelib_beak_simple((autocvar_g_turrets_unit_ewheel_speed_stop));
+        movelib_brake_simple((autocvar_g_turrets_unit_ewheel_speed_stop));
     }
 
     turrets_setframe(newframe, false);
@@ -132,7 +132,7 @@ void ewheel_move_idle()
 
     self.frame = 0;
     if (vlen(self.velocity))
-        movelib_beak_simple((autocvar_g_turrets_unit_ewheel_speed_stop));
+        movelib_brake_simple((autocvar_g_turrets_unit_ewheel_speed_stop));
 }
 
 spawnfunc(turret_ewheel) { if(!turret_initialize(TUR_EWHEEL)) remove(self); }
diff --git a/qcsrc/common/turrets/turret/walker.qc b/qcsrc/common/turrets/turret/walker.qc
index 97167eb36..a7ec5d76d 100644
--- a/qcsrc/common/turrets/turret/walker.qc
+++ b/qcsrc/common/turrets/turret/walker.qc
@@ -470,12 +470,12 @@ spawnfunc(turret_walker) { if(!turret_initialize(TUR_WALKER)) remove(self); }
                 switch (self.animflag)
                 {
                     case ANIM_NO:
-                        movelib_beak_simple((autocvar_g_turrets_unit_walker_speed_stop));
+                        movelib_brake_simple((autocvar_g_turrets_unit_walker_speed_stop));
                         break;
 
                     case ANIM_TURN:
                         turny = (autocvar_g_turrets_unit_walker_turn);
-                        movelib_beak_simple((autocvar_g_turrets_unit_walker_speed_stop));
+                        movelib_brake_simple((autocvar_g_turrets_unit_walker_speed_stop));
                         break;
 
                     case ANIM_WALK:
@@ -518,7 +518,7 @@ spawnfunc(turret_walker) { if(!turret_initialize(TUR_WALKER)) remove(self); }
                             defer(self, 0.21, walker_melee_do_dmg);
                         }
 
-                        movelib_beak_simple((autocvar_g_turrets_unit_walker_speed_stop));
+                        movelib_brake_simple((autocvar_g_turrets_unit_walker_speed_stop));
                         break;
 
                     case ANIM_SWIM:
@@ -630,7 +630,7 @@ spawnfunc(turret_walker) { if(!turret_initialize(TUR_WALKER)) remove(self); }
 #endif // SVQC
 #ifdef CSQC
 
-#include "../../../client/movelib.qh"
+#include "../../physics/movelib.qh"
 
 void walker_draw(entity this)
 {
diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc
index d817c2e1a..b13c8b3ac 100644
--- a/qcsrc/common/vehicles/vehicle/spiderbot.qc
+++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc
@@ -189,7 +189,7 @@ float spiderbot_frame()
 						//dprint("spiderbot_idle:", ftos(soundlength("vehicles/spiderbot_idle.wav")), "\n");
 						sound (self, CH_TRIGGER_SINGLE, SND_VEH_SPIDERBOT_IDLE, VOL_VEHICLEENGINE, ATTEN_NORM);
 					}
-					movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop);
+					movelib_brake_simple(autocvar_g_vehicle_spiderbot_speed_stop);
 					spider.frame = 5;
 				}
 			}
@@ -570,7 +570,7 @@ spawnfunc(vehicle_spiderbot)
 		METHOD(Spiderbot, vr_think, void(Spiderbot thisveh))
 		{
 			if(self.flags & FL_ONGROUND)
-				movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop);
+				movelib_brake_simple(autocvar_g_vehicle_spiderbot_speed_stop);
 		}
 		METHOD(Spiderbot, vr_death, void(Spiderbot thisveh))
 		{
diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 862697eb8..7db276f66 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -14,7 +14,7 @@
 	#include "../../client/autocvars.qh"
 	#include "../deathtypes/all.qh"
 	#include "../../lib/csqcmodel/interpolate.qh"
-	#include "../movetypes/movetypes.qh"
+	#include "../physics/movetypes/movetypes.qh"
 	#include "../../client/main.qh"
 	#include "../../lib/csqcmodel/cl_model.qh"
 #elif defined(MENUQC)
diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc
index 10f475fb3..7bceb5383 100644
--- a/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@ -28,7 +28,7 @@
 #include "../../client/defs.qh"
 #include "../../client/main.qh"
 #include "../../common/constants.qh"
-#include "../../common/physics.qh"
+#include "../../common/physics/player.qh"
 #include "../../common/stats.qh"
 #include "../../common/triggers/trigger/viewloc.qh"
 #include "../../common/util.qh"
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index d3d14a5cf..967bc684b 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -33,7 +33,7 @@
 #include "weapons/weaponsystem.qh"
 
 #include "../common/net_notice.qh"
-#include "../common/physics.qh"
+#include "../common/physics/player.qh"
 
 #include "../common/items/all.qc"
 
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 319c20488..a743a618c 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -22,7 +22,7 @@
 #include "../../common/deathtypes/all.qh"
 #include "../../common/mapinfo.qh"
 #include "../../common/notifications.qh"
-#include "../../common/physics.qh"
+#include "../../common/physics/player.qh"
 #include "../../common/teams.qh"
 #include "../../common/util.qh"
 #include "../../common/triggers/triggers.qh"
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index e5ee28cc8..2e949ec36 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -15,7 +15,7 @@
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications.qh"
-#include "../common/movetypes/movetypes.qh"
+#include "../common/physics/movetypes/movetypes.qh"
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 0fa0462d8..b5362329a 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -25,7 +25,7 @@
 #include "../common/monsters/sv_monsters.qh"
 #include "../common/vehicles/all.qh"
 #include "../common/notifications.qh"
-#include "../common/physics.qh"
+#include "../common/physics/player.qh"
 #include "../common/playerstats.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"