Remove physics macro includes

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 4a67b7d77518fd40fde6875b67e1e4ddfdac7f7e..3a526dc0c230809f8bd36af86851a340fb9c5ca3 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -120,6 +120,7 @@ command/cl_cmd.qc
 
 ../common/monsters/monsters.qc
 
+../common/physics.qh
 ../server/mutators/mutator_dodging.qc
 
 ../common/nades.qc

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index e7e088eef72157e36c64c74bba8ec988dd460780..db60f2cb99947979c2166ac6f764f246084038d5 100644 (file)
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -1,5 +1,3 @@
-#include "./physics.qh"
-
 .float race_penalty;
 .float restart_jump;
 

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index df8edc5701d97801134ca16fa01b9ca2c4d1e53a..77666a15df31e1a23b35178e3325072a881aaf7f 100644 (file)
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -1,89 +1,5 @@
 // Client/server mappings
 
-#undef PHYS_INPUT_ANGLES
-#undef PHYS_INPUT_BUTTONS
-#undef PHYS_INPUT_TIMELENGTH
-#undef PHYS_INPUT_MOVEVALUES
-
-#undef PHYS_WORLD_ANGLES
-
-#undef PHYS_DEAD
-
-#undef PHYS_BUTTON_HOOK
-
-#undef GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE
-#undef GAMEPLAYFIX_NOGRAVITYONGROUND
-#undef GAMEPLAYFIX_Q2AIRACCELERATE
-
-#undef IS_DUCKED
-#undef SET_DUCKED
-#undef UNSET_DUCKED
-
-#undef IS_JUMP_HELD
-#undef SET_JUMP_HELD
-#undef UNSET_JUMP_HELD
-
-#undef IS_ONGROUND
-#undef SET_ONGROUND
-#undef UNSET_ONGROUND
-
-#undef ITEMS
-
-#undef PHYS_AMMO_FUEL
-
-#undef PHYS_FROZEN
-
-#undef PHYS_ACCELERATE
-#undef PHYS_AIRACCEL_QW
-#undef PHYS_AIRACCEL_QW_STRETCHFACTOR
-#undef PHYS_AIRACCEL_SIDEWAYS_FRICTION
-#undef PHYS_AIRACCELERATE
-#undef PHYS_AIRCONTROL
-#undef PHYS_AIRCONTROL_PENALTY
-#undef PHYS_AIRCONTROL_POWER
-#undef PHYS_AIRSPEEDLIMIT_NONQW
-#undef PHYS_AIRSTOPACCELERATE
-#undef PHYS_AIRSTRAFEACCEL_QW
-#undef PHYS_AIRSTRAFEACCELERATE
-#undef PHYS_ENTGRAVITY
-#undef PHYS_FRICTION
-#undef PHYS_GRAVITY
-#undef PHYS_HIGHSPEED
-#undef PHYS_JUMPVELOCITY
-#undef PHYS_MAXAIRSPEED
-#undef PHYS_MAXAIRSTRAFESPEED
-#undef PHYS_MAXSPEED
-#undef PHYS_STEPHEIGHT
-#undef PHYS_STOPSPEED
-#undef PHYS_WARSOWBUNNY_ACCEL
-#undef PHYS_WARSOWBUNNY_BACKTOSIDERATIO
-#undef PHYS_WARSOWBUNNY_AIRFORWARDACCEL
-#undef PHYS_WARSOWBUNNY_TOPSPEED
-#undef PHYS_WARSOWBUNNY_TURNACCEL
-
-#undef PHYS_JETPACK_ACCEL_UP
-#undef PHYS_JETPACK_ACCEL_SIDE
-#undef PHYS_JETPACK_ANTIGRAVITY
-#undef PHYS_JETPACK_FUEL
-#undef PHYS_JETPACK_MAXSPEED_UP
-#undef PHYS_JETPACK_MAXSPEED_SIDE
-
-#undef PHYS_DODGING_FRAMETIME
-#undef PHYS_DODGING
-#undef PHYS_DODGING_DELAY
-#undef PHYS_DODGING_TIMEOUT
-#undef PHYS_DODGING_HORIZ_SPEED_FROZEN
-#undef PHYS_DODGING_FROZEN
-#undef PHYS_DODGING_FROZEN_NODOUBLETAP
-#undef PHYS_DODGING_HORIZ_SPEED
-#undef PHYS_DODGING_PRESSED_KEYS
-#undef PHYS_DODGING_HEIGHT_THRESHOLD
-#undef PHYS_DODGING_DISTANCE_THRESHOLD
-#undef PHYS_DODGING_RAMP_TIME
-#undef PHYS_DODGING_UP_SPEED
-#undef PHYS_DODGING_WALL
-
-
 #ifdef CSQC
 
        #define PHYS_INPUT_ANGLES(s)                            input_angles

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index bc4a378975da976e564c014dfa0aac8036fdfe9b..45deeab04cff809f580095ff21b40206e4fe6661 100644 (file)
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -1,4 +1,3 @@
-#include "../../common/physics.qh"
 #ifdef SVQC
 
 .float cvar_cl_dodging_timeout;

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index f18f15db0bc509253ac854564d9484f4def2d381..692ebd6e0e228f1f80f7a2a3645d124c428988a8 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -116,6 +116,7 @@ g_damage.qc
 
 teamplay.qc
 
+../common/physics.qh
 ../common/physics.qc
 
 // tZork's libs