Merge remote branch 'origin/master' into fruitiex/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / util.qc

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 5329d4e0accc171a4ce02b893f5f265fe122ea1b..f33512f2355f8823669f1140b691dfe779be7282 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -226,43 +226,8 @@ float median(float a, float b, float c)
 // works for up to 10 decimals!
 string ftos_decimals(float number, float decimals)
 {
-       string result;
-       string tmp;
-       float len;
-
-       // if negative, cut off the sign first
-       if(number < 0)
-               return strcat("-", ftos_decimals(-number, decimals));
-       // it now is always positive!
-
-       // 3.516 -> 352
-       number = floor(number * pow(10, decimals) + 0.5);
-
-       // 352 -> "352"
-       result = ftos(number);
-       len = strlen(result);
-       // does it have a decimal point (should not happen)? If there is one, it is always at len-7)
-               // if ftos had messed it up, which should never happen: "34278.000000"
-       if(len >= 7)
-               if(substring(result, len - 7, 1) == ".")
-               {
-                       dprint("ftos(integer) has comma? Can't be. Affected result: ", result, "\n");
-                       result = substring(result, 0, len - 7);
-                       len -= 7;
-               }
-               // "34278"
-       if(decimals == 0)
-               return result; // don't insert a point for zero decimals
-       // is it too short? If yes, insert leading zeroes
-       if(len <= decimals)
-       {
-               result = strcat(substring("0000000000", 0, decimals - len + 1), result);
-               len = decimals + 1;
-       }
-       // and now... INSERT THE POINT!
-       tmp = substring(result, len - decimals, decimals);
-       result = strcat(substring(result, 0, len - decimals), ".", tmp);
-       return result;
+       // we have sprintf...
+       return sprintf("%.*f", decimals, number);
 }
 
 float time;
@@ -1949,24 +1914,8 @@ float get_model_parameters(string m, float sk)
        return 1;
 }
 
-// return name of given panel id
-string HUD_Panel_GetName(float id)
-{
-       switch(id) {
-               case HUD_PANEL_WEAPONICONS: return "weaponicons"; break;
-               case HUD_PANEL_INVENTORY: return "inventory"; break;
-               case HUD_PANEL_POWERUPS: return "powerups"; break;
-               case HUD_PANEL_HEALTHARMOR: return "healtharmor"; break;
-               case HUD_PANEL_NOTIFY: return "notify"; break;
-               case HUD_PANEL_TIMER: return "timer"; break;
-               case HUD_PANEL_RADAR: return "radar"; break;
-               case HUD_PANEL_SCORE: return "score"; break;
-               case HUD_PANEL_RACETIMER: return "racetimer"; break;
-               case HUD_PANEL_VOTE: return "vote"; break;
-               case HUD_PANEL_MODICONS: return "modicons"; break;
-               case HUD_PANEL_PRESSEDKEYS: return "pressedkeys"; break;
-               case HUD_PANEL_CHAT: return "chat"; break;
-               default: return "";
-       }
+vector vec2(vector v)
+{
+       v_z = 0;
+       return v;
 }
-