Merge master into qc_physics_prehax (blame TimePath if it's completely broken)

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

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index c704bc917c57fa8b0459295b7eb0909e91ccc133..599eee5d167c68a8abb4f33968944b6a2ca07510 100644 (file)
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -94,7 +94,7 @@ bool IsFlying(entity a);
 
        #define WAS_ONGROUND(s)                                         !!(s.lastflags & FL_ONGROUND)
 
-       #define ITEMS(s)                                                        (s).items
+       #define ITEMS_STAT(s)                                           (s).items
        #define BUFFS(s)                                                        getstati(STAT_BUFFS)
 
        #define PHYS_AMMO_FUEL(s)                                       getstati(STAT_FUEL)
@@ -271,7 +271,7 @@ bool IsFlying(entity a);
 
        #define WAS_ONGROUND(s)                                         !!((s).lastflags & FL_ONGROUND)
 
-       #define ITEMS(s)                                                        s.items
+       #define ITEMS_STAT(s)                                           s.items
        #define BUFFS(s)                                                        (s).buffs
 
        #define PHYS_AMMO_FUEL(s)                                       s.ammo_fuel