Merge branch 'master' into Mario/user_movetypes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / player.qh

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index f1553f2f130c7e4f2f6f07098ac2a84242b84cd4..9e7b799d027257e72d1201f6f013fcbffe57eb99 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -1,5 +1,4 @@
-#ifndef COMMON_PHYSICS_H
-#define COMMON_PHYSICS_H
+#pragma once
 
 // Client/server mappings
 
@@ -25,7 +24,7 @@
 .vector v_angle_old;
 .string lastclassname;
 
-.float(entity) PlayerPhysplug;
+.float(entity,float) PlayerPhysplug;
 float AdjustAirAccelQW(float accelqw, float factor);
 
 bool IsFlying(entity a);
@@ -168,7 +167,6 @@ STATIC_INIT(PHYS_INPUT_BUTTON_JETPACK)
 #ifdef CSQC
 
        #define PHYS_FIXANGLE(s) ('0 0 0')
-       #define PHYS_MOVETYPE(s) ((s).move_movetype)
 
        string autocvar_cl_jumpspeedcap_min;
        string autocvar_cl_jumpspeedcap_max;
@@ -245,7 +243,6 @@ STATIC_INIT(PHYS_INPUT_BUTTON_JETPACK)
 #elif defined(SVQC)
 
        #define PHYS_FIXANGLE(s) ((s).fixangle)
-       #define PHYS_MOVETYPE(s) ((s).movetype)
 
        bool Physics_Valid(string thecvar);
 
@@ -327,5 +324,3 @@ NET_HANDLE(setpause, bool)
        return true;
 }
 #endif
-
-#endif