]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/physics.qh
common: move instagib and nexball as they add custom items and weapons
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics.qh
index 17de7b22733aa414700b9b0fa7f09b4b14f1b4af..a249b238d7bf197650833c3e3d1badad89135478 100644 (file)
@@ -43,8 +43,8 @@ bool IsFlying(entity a);
        #define IS_PLAYER(s)                                            (s).isplayermodel
        #define isPushable(s)                                           (s).isplayermodel
 
-       float player_multijump;
-       float player_jumpheight;
+       //float player_multijump;
+       //float player_jumpheight;
 
        #define PHYS_INPUT_ANGLES(s)                            input_angles
 // TODO
@@ -95,7 +95,7 @@ bool IsFlying(entity a);
        #define WAS_ONGROUND(s)                                         !!(s.lastflags & FL_ONGROUND)
 
        #define ITEMS_STAT(s)                                           (s).items
-       #define BUFFS(s)                                                        getstati(STAT_BUFFS)
+       #define BUFFS_STAT(s)                                           getstati(STAT_BUFFS)
 
        #define PHYS_AMMO_FUEL(s)                                       getstati(STAT_FUEL)
 
@@ -119,8 +119,8 @@ bool IsFlying(entity a);
        #define PHYS_BUGRIGS_REVERSE_SPINNING           getstatf(STAT_BUGRIGS_REVERSE_SPINNING)
        #define PHYS_BUGRIGS_REVERSE_STOPPING           getstatf(STAT_BUGRIGS_REVERSE_STOPPING)
 
-       #define PHYS_JUMPSPEEDCAP_MIN                           getstatf(STAT_MOVEVARS_JUMPSPEEDCAP_MIN)
-       #define PHYS_JUMPSPEEDCAP_MAX                           getstatf(STAT_MOVEVARS_JUMPSPEEDCAP_MAX)
+       #define PHYS_JUMPSPEEDCAP_MIN                           cvar_string("cl_jumpspeedcap_min")
+       #define PHYS_JUMPSPEEDCAP_MAX                           cvar_string("cl_jumpspeedcap_max")
        #define PHYS_JUMPSPEEDCAP_DISABLE_ONRAMPS       getstati(STAT_MOVEVARS_JUMPSPEEDCAP_DISABLE_ONRAMPS)
 
        #define PHYS_TRACK_CANJUMP(s)                           getstati(STAT_MOVEVARS_TRACK_CANJUMP)
@@ -191,8 +191,8 @@ bool IsFlying(entity a);
 
        .float stat_doublejump;
 
-       .float stat_jumpspeedcap_min;
-       .float stat_jumpspeedcap_max;
+       .string stat_jumpspeedcap_min;
+       .string stat_jumpspeedcap_max;
        .float stat_jumpspeedcap_disable_onramps;
 
        .float stat_jetpack_accel_side;
@@ -295,7 +295,7 @@ bool IsFlying(entity a);
        #define WAS_ONGROUND(s)                                         !!((s).lastflags & FL_ONGROUND)
 
        #define ITEMS_STAT(s)                                           s.items
-       #define BUFFS(s)                                                        (s).buffs
+       #define BUFFS_STAT(s)                                           (s).buffs
 
        #define PHYS_AMMO_FUEL(s)                                       s.ammo_fuel