Fix compile
authorMario <mario@smbclan.net>
Wed, 23 Dec 2015 08:55:56 +0000 (18:55 +1000)
committerMario <mario@smbclan.net>
Wed, 23 Dec 2015 08:55:56 +0000 (18:55 +1000)
34 files changed:
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/t_items.qc
qcsrc/client/view.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/effects/qc/casings.qc
qcsrc/common/effects/qc/damageeffects.qc
qcsrc/common/effects/qc/gibs.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
qcsrc/common/mutators/mutator/dodging/dodging.qc
qcsrc/common/mutators/mutator/doublejump/doublejump.qc
qcsrc/common/mutators/mutator/multijump/multijump.qc
qcsrc/common/physics/all.inc
qcsrc/common/physics/movelib.qc
qcsrc/common/physics/movelib.qh
qcsrc/common/physics/movetypes/all.inc [new file with mode: 0644]
qcsrc/common/physics/movetypes/include.qc [deleted file]
qcsrc/common/physics/movetypes/include.qh [deleted file]
qcsrc/common/physics/movetypes/movetypes.qc
qcsrc/common/physics/movetypes/push.qc
qcsrc/common/physics/movetypes/toss.qc
qcsrc/common/physics/movetypes/walk.qc
qcsrc/common/physics/player.qc
qcsrc/common/stats.qh
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/turrets/turret/ewheel.qc
qcsrc/common/turrets/turret/walker.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/all.qc
qcsrc/lib/csqcmodel/cl_player.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc

index 83c3f44..7ebc11f 100644 (file)
@@ -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"
index b0e1315..097f546 100644 (file)
@@ -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"
index 8350523..cdeb247 100644 (file)
@@ -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"
index 04d7284..48f02c4 100644 (file)
@@ -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"
 
index 7393217..5d8a87d 100644 (file)
@@ -3,7 +3,7 @@
 #include "../../util.qh"
 
 #ifdef CSQC
-#include "../../movetypes/movetypes.qh"
+#include "../../physics/movetypes/movetypes.qh"
 #include "rubble.qh"
 #endif
 
index e77f63f..2de4ef1 100644 (file)
@@ -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"
index 19f4750..2e24809 100644 (file)
@@ -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;
index e949e3a..27e1246 100644 (file)
@@ -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;
        }
 
index 1943413..887dcbf 100644 (file)
@@ -2,7 +2,7 @@
 #ifdef SVQC
        #include "../../../../server/antilag.qh"
 #endif
-#include "../../../physics.qh"
+#include "../../../physics/player.qh"
 
 
 #if defined(SVQC)
index d2debd8..053cdd7 100644 (file)
@@ -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);
 
index a7aaa78..a72644d 100644 (file)
@@ -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);
index 7a8b292..eb5e64a 100644 (file)
@@ -2,7 +2,7 @@
 #ifdef SVQC
        #include "../../../../server/antilag.qh"
 #endif
-#include "../../../physics.qh"
+#include "../../../physics/player.qh"
 
 
 #if defined(SVQC)
index cea8df7..1825120 100644 (file)
@@ -1,3 +1,3 @@
 #include "player.qc"
 #include "movelib.qc"
-#include "movetypes/include.qc"
+#include "movetypes/all.inc"
index acacba0..38afbe2 100644 (file)
@@ -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;
index 8a4bfd4..c1fd574 100644 (file)
@@ -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 (file)
index 0000000..322b3c4
--- /dev/null
@@ -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 (file)
index 322b3c4..0000000
+++ /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 (file)
index a96e595..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MOVETYPES_INCLUDE_H
-#define MOVETYPES_INCLUDE_H
-
-#include "push.qh"
-#include "toss.qh"
-#include "walk.qh"
-
-#endif
index fc9396b..fa169e9 100644 (file)
@@ -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
index b832465..3b3c648 100644 (file)
@@ -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')
index 43b5a8a..44f8a98 100644 (file)
@@ -1,4 +1,5 @@
-#include "../physics.qh"
+#include "toss.qh"
+#include "../player.qh"
 
 void _Movetype_Physics_Toss(entity this, float dt)  // SV_Physics_Toss
 {
index e926246..579a1cb 100644 (file)
@@ -1,3 +1,5 @@
+#include "walk.qh"
+
 void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 {
        vector stepnormal = '0 0 0';
index 32c2fbf..68cae73 100644 (file)
@@ -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)
index fc82c13..4409e70 100644 (file)
@@ -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)
index 1f2f84a..d0b8f94 100644 (file)
@@ -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();
index 1d46473..1757dea 100644 (file)
@@ -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); }
index 97167eb..a7ec5d7 100644 (file)
@@ -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)
 {
index d817c2e..b13c8b3 100644 (file)
@@ -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))
                {
index 862697e..7db276f 100644 (file)
@@ -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)
index 10f475f..7bceb53 100644 (file)
@@ -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"
index d3d14a5..967bc68 100644 (file)
@@ -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"
 
index 319c204..a743a61 100644 (file)
@@ -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"
index e5ee28c..2e949ec 100644 (file)
@@ -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"
index 0fa0462..b536232 100644 (file)
@@ -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"