X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=3567a2b095d522857ec2e2e4454de22c3e2d3dd5;hb=5efdcfb8dfe4c689b2b5135f8b6e31e56cc0bc47;hp=7713679f3ce57a2cbaa1deb6cd9f663a3245e6d0;hpb=6c3f2ebbfc14b92d5e608e902d4e94e0867cb50b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 7713679f3..3567a2b09 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -316,20 +316,7 @@ string ScoreString(int pFlags, float pValue) if((pValue == 0) && (pFlags & (SFL_HIDE_ZERO | SFL_RANK | SFL_TIME))) valstr = ""; else if(pFlags & SFL_RANK) - { - valstr = ftos(pValue); - l = strlen(valstr); - if((l >= 2) && (substring(valstr, l - 2, 1) == "1")) - valstr = strcat(valstr, "th"); - else if(substring(valstr, l - 1, 1) == "1") - valstr = strcat(valstr, "st"); - else if(substring(valstr, l - 1, 1) == "2") - valstr = strcat(valstr, "nd"); - else if(substring(valstr, l - 1, 1) == "3") - valstr = strcat(valstr, "rd"); - else - valstr = strcat(valstr, "th"); - } + valstr = count_ordinal(pValue); else if(pFlags & SFL_TIME) valstr = TIME_ENCODED_TOSTRING(pValue); else @@ -457,7 +444,7 @@ STATIC_INIT(compressShortVector) l *= f; } - if(cvar("developer")) + if(cvar("developer") > 0) { LOG_TRACE("Verifying vector compression table..."); for(i = 0x0F00; i < 0xFFFF; ++i) @@ -521,7 +508,7 @@ string fixPriorityList(string order, float from, float to, float subtract, float n = tokenize_console(neworder); for(w = to; w >= from; --w) { - int wflags = Weapons_from(w).spawnflags; + int wflags = REGISTRY_GET(Weapons, w).spawnflags; if(wflags & WEP_FLAG_SPECIALATTACK) continue; for(i = 0; i < n; ++i)