Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index a135cb5be560ee8f886e620eb24f340a28f8dc6f..00f687d8fd9edf487e2d9c77ac03bb63de4ec0b8 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1372,6 +1372,7 @@ float GetAmmoTypeForWep(float i)
        }
 }
 
+#define acc_color(i) stov(cvar_string(strcat("hud_weaponicons_accuracy_color", ftos(i))))
 #define MAX_ACCURACY_LEVELS 10
 float acc_lev[MAX_ACCURACY_LEVELS];
 
@@ -1500,8 +1501,6 @@ void HUD_WeaponIcons(void)
                        while ( j && weapon_stats < acc_lev[j] )
                                --j;
 
-#define acc_color(i) stov(cvar_string(strcat("hud_weaponicons_accuracy_color", ftos(i))))
-
                        // inject color j+1 in color j, how much depending on how much weapon_stats is higher than level j
                        float factor;
                        factor = (weapon_stats - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]);