From: terencehill Date: Sun, 6 Feb 2022 14:51:50 +0000 (+0100) Subject: Rename mmssss to mmssth and mmsss to mmsst, more correct and easier to tell them... X-Git-Tag: xonotic-v0.8.5~209^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54566b17da06df1560bba7ceebd1f37345a0cbcf;p=xonotic%2Fxonotic-data.pk3dir.git Rename mmssss to mmssth and mmsss to mmsst, more correct and easier to tell them apart --- diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 17d2047dc..8d882bf3c 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -359,8 +359,8 @@ float autocvar_notification_show_sprees_center_specialonly = true; f1points: point or points depending on f1 f1ord: count_ordinal of f1 f1time: process_time of f1 - f1race_time: mmssss of f1 - f2race_time: mmssss of f2 + f1race_time: mmssth of f1 + f2race_time: mmssth of f2 race_col: color of race time/position (i.e. good or bad) race_diff: show time difference between f2 and f3 missing_teams: show which teams still need players @@ -419,11 +419,11 @@ string BUFF_NAME(int i); ARG_CASE(ARG_CS, "f1points", (f1 == 1 ? _("point") : _("points"))) \ ARG_CASE(ARG_CS_SV, "f1ord", count_ordinal(f1)) \ ARG_CASE(ARG_CS_SV, "f1time", process_time(2, f1)) \ - ARG_CASE(ARG_CS_SV_HA, "f1race_time", mmssss(f1)) \ - ARG_CASE(ARG_CS_SV_HA, "f2race_time", mmssss(f2)) \ - ARG_CASE(ARG_CS_SV_HA, "f3race_time", mmssss(f3)) \ + ARG_CASE(ARG_CS_SV_HA, "f1race_time", mmssth(f1)) \ + ARG_CASE(ARG_CS_SV_HA, "f2race_time", mmssth(f2)) \ + ARG_CASE(ARG_CS_SV_HA, "f3race_time", mmssth(f3)) \ ARG_CASE(ARG_CS_SV, "race_col", CCR(((f1 == 1) ? "^F1" : "^F2"))) \ - ARG_CASE(ARG_CS_SV, "race_diff", ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssss(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssss(f3 - f2)))) \ + ARG_CASE(ARG_CS_SV, "race_diff", ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssth(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssth(f3 - f2)))) \ ARG_CASE(ARG_CS, "missing_teams", notif_arg_missing_teams(f1)) \ ARG_CASE(ARG_CS, "pass_key", getcommandkey(_("drop flag"), "+use")) \ ARG_CASE(ARG_CS, "nade_key", getcommandkey(_("throw nade"), "dropweapon")) \ diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 63fd27839..1334f5ec3 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -54,7 +54,7 @@ void depthfirst(entity start, .entity up, .entity downleft, .entity right, void( const int TIME_DECIMALS = 2; const float TIME_FACTOR = 100; -#define TIME_ENCODED_TOSTRING(n) mmssss(n) +#define TIME_ENCODED_TOSTRING(n) mmssth(n) #define RACE_RECORD "/race100record/" #define CTS_RECORD "/cts100record/" #define CTF_RECORD "/ctf100record/" diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh index e62edec9b..79ba56ebe 100644 --- a/qcsrc/lib/string.qh +++ b/qcsrc/lib/string.qh @@ -154,8 +154,8 @@ string clockedtime_tostring(int tm, bool hundredths) return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, hundredths ? 2 : 1)); } -#define mmsss(tm) clockedtime_tostring(tm, false) -#define mmssss(tm) clockedtime_tostring(tm, true) +#define mmsst(tm) clockedtime_tostring(tm, false) +#define mmssth(tm) clockedtime_tostring(tm, true) ERASEABLE string format_time(float seconds)