From d6e867668fdd93a8718d2a1b2525b8437803b119 Mon Sep 17 00:00:00 2001 From: Nordic Warrior Date: Wed, 8 Sep 2021 17:51:11 +0300 Subject: [PATCH 1/2] scheduler: show name who is starts or stops vote --- cstrike/addons/amxmodx/data/lang/mapmanager.txt | 2 ++ .../addons/amxmodx/scripting/map_manager_scheduler.sma | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cstrike/addons/amxmodx/data/lang/mapmanager.txt b/cstrike/addons/amxmodx/data/lang/mapmanager.txt index 9b9409d..b79984b 100644 --- a/cstrike/addons/amxmodx/data/lang/mapmanager.txt +++ b/cstrike/addons/amxmodx/data/lang/mapmanager.txt @@ -1,5 +1,6 @@ [en] MAPM_VOTE_WILL_BEGIN = The voting will begin in next round. +MAPM_START_VOTE = %s^1 started voting. MAPM_CANCEL_VOTE = %s^1 canceled voting. MAPM_TIME_TO_END = Until map end left MAPM_TIMELEFT_OR = or @@ -57,6 +58,7 @@ MAPM_CHANGELEVEL_NEXTROUND = Map will change in next round. [ru] MAPM_VOTE_WILL_BEGIN = Голосование начнется в следующем раунде. +MAPM_START_VOTE = %s^1 запустил голосование. MAPM_CANCEL_VOTE = %s^1 отменил голосование. MAPM_TIME_TO_END = До конца карты осталось MAPM_TIMELEFT_OR = либо diff --git a/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma b/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma index 5ada955..6771ff7 100644 --- a/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma +++ b/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma @@ -230,8 +230,10 @@ public concmd_startvote(id, level, cid) } new name[32]; get_user_name(id, name, charsmax(name)); + client_print_color(0, id, "%s^3 %L", g_sPrefix, LANG_PLAYER, "MAPM_START_VOTE", name); + log_amx("%s started vote", id ? name : "Server"); - + planning_vote(VOTE_BY_CMD); return PLUGIN_HANDLED; @@ -243,8 +245,10 @@ public concmd_stopvote(id, level, cid) } new name[32]; get_user_name(id, name, charsmax(name)); + client_print_color(0, id, "%s^3 %L", g_sPrefix, LANG_PLAYER, "MAPM_CANCEL_VOTE", name); + log_amx("%s stopped vote", id ? name : "Server"); - + mapm_stop_vote(); if(mapm_get_vote_type() == VOTE_BY_SCHEDULER_SECOND) { From 14a6a31f03e7baec0d75933024e95d6435d1054b Mon Sep 17 00:00:00 2001 From: Nordic Warrior Date: Wed, 8 Sep 2021 20:37:05 +0300 Subject: [PATCH 2/2] scheduler: fix showing name if cmd executed by server --- cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma b/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma index 6771ff7..27fc0cf 100644 --- a/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma +++ b/cstrike/addons/amxmodx/scripting/map_manager_scheduler.sma @@ -230,7 +230,7 @@ public concmd_startvote(id, level, cid) } new name[32]; get_user_name(id, name, charsmax(name)); - client_print_color(0, id, "%s^3 %L", g_sPrefix, LANG_PLAYER, "MAPM_START_VOTE", name); + client_print_color(0, id, "%s^3 %L", g_sPrefix, LANG_PLAYER, "MAPM_START_VOTE", id ? name : "Server"); log_amx("%s started vote", id ? name : "Server"); @@ -245,7 +245,7 @@ public concmd_stopvote(id, level, cid) } new name[32]; get_user_name(id, name, charsmax(name)); - client_print_color(0, id, "%s^3 %L", g_sPrefix, LANG_PLAYER, "MAPM_CANCEL_VOTE", name); + client_print_color(0, id, "%s^3 %L", g_sPrefix, LANG_PLAYER, "MAPM_CANCEL_VOTE", id ? name : "Server"); log_amx("%s stopped vote", id ? name : "Server");