From: terencehill Date: Sat, 30 May 2020 14:10:35 +0000 (+0200) Subject: centerprint_kill --> centerprint_Kill X-Git-Tag: xonotic-v0.8.5~992 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b5badea32b3346357fd7875731654d2aab9bad52 centerprint_kill --> centerprint_Kill --- diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 4995f5189..ae04b5be1 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -85,7 +85,7 @@ void Announcer_Gamestart() { if(announcer_countdown) { - centerprint_kill(ORDINAL(CPID_ROUND)); + centerprint_Kill(ORDINAL(CPID_ROUND)); if(announcer_countdown) { delete(announcer_countdown); diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index f2563c741..0ddf5f347 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -47,7 +47,7 @@ bool centerprint_showing; void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num) { TC(int, new_id); TC(int, countdown_num); - //printf("centerprint_Add(%d, '%s^7', %d, %d);\n", new_id, strMessage, duration, countdown_num); + //LOG_INFOF("centerprint_Add: ^2id: %d ^3dur: %d ^5countdown: %d\n'%s'", new_id, duration, countdown_num, strreplace("\n", "^7\\n^7", strMessage)); int i, j; if(strMessage == "" && new_id == 0) @@ -124,7 +124,7 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdow centerprint_countdown_num[j] = countdown_num; } -void centerprint_kill(int id) +void centerprint_Kill(int id) { TC(int, id); centerprint_Add(id, "", 0, 0); diff --git a/qcsrc/client/hud/panel/centerprint.qh b/qcsrc/client/hud/panel/centerprint.qh index 92339139f..8d2617955 100644 --- a/qcsrc/client/hud/panel/centerprint.qh +++ b/qcsrc/client/hud/panel/centerprint.qh @@ -3,5 +3,5 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num); void centerprint_AddStandard(string strMessage); -void centerprint_kill(int id); +void centerprint_Kill(int id); void centerprint_KillAll(); diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index 371bbebee..d6db436d0 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -1410,7 +1410,7 @@ NET_HANDLE(ENT_CLIENT_NOTIFICATION, bool is_new) if (net_name == CPID_Null) { centerprint_KillAll(); } else { - centerprint_kill(ORDINAL(net_name));// kill group + centerprint_Kill(ORDINAL(net_name));// kill group } return; }