Rename a stat again

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 0604a0424ed7dadd5bcbe360de4e65eea9cd4a9b..696ec575995fb7d9b3cafa7cd5144fccce627b9f 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -850,7 +850,7 @@ void CSQC_UpdateView(float w, float h)
 
                        // TrueAim check
                        float shottype;
-                       float weapon_load, weapon_clipsize, ring_scale;
+                       float weapon_clipload, weapon_clipsize, ring_scale;
                        // wcross_origin = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
                        wcross_origin = project_3d_to_2d(view_origin + MAX_SHOT_DISTANCE * view_forward);
                        wcross_origin_z = 0;
@@ -996,11 +996,11 @@ void CSQC_UpdateView(float w, float h)
                                nex_charge_movingavg = nex_charge;
 
                        // ring around crosshair representing bullets left in weapon clip
-                       weapon_load = getstati(STAT_WEAPON_LOAD);
-                       if (weapon_load)
+                       weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);
+                       if (weapon_clipload)
                        {
                                weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);
-                               f = bound(0, weapon_load / weapon_clipsize, 1);
+                               f = bound(0, weapon_clipload / weapon_clipsize, 1);
 
                                a = autocvar_crosshair_ring_sniperrifle_alpha;
                                DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 2a086e9162f66ef3dcc987e1718299325af9c9a8..78548a55c0c43b3237d91a610c646d4d217ab476 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -307,7 +307,7 @@ const float STAT_FUEL = 44;
 const float STAT_NB_METERSTART = 45;
 const float STAT_SHOTORG = 46; // compressShotOrigin
 const float STAT_LEADLIMIT = 47;
-const float STAT_WEAPON_LOAD = 48;
+const float STAT_WEAPON_CLIPLOAD = 48;
 const float STAT_WEAPON_CLIPSIZE = 49;
 const float STAT_NEX_CHARGE = 50;
 const float STAT_LAST_PICKUP = 51;

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 00a87c520245e9b6b01928b11aa3314cf695c6d0..80b861b2f02de8727ea751e863a0a6a88c6a389a 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -818,7 +818,7 @@ void spawnfunc_worldspawn (void)
        addstat(STAT_FUEL, AS_INT, ammo_fuel);
        addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
        addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
-       addstat(STAT_WEAPON_LOAD, AS_INT, ammo_loaded);
+       addstat(STAT_WEAPON_CLIPLOAD, AS_INT, ammo_loaded);
        addstat(STAT_WEAPON_CLIPSIZE, AS_INT, ammo_max);
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);