diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index cad4e354..6618ace1 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -94,10 +94,23 @@ menuitemtextinput "Server admin password: " "" "alias acc3 $arg1" "" 128 menuitem "" -1 menuitem " 2 [ Admin connect ] " "connectadmin $acc1 $acc2 $acc3" -newmenu kick/ban +_kickbanaction = kick +newmenu reason +menuinit [ _kickbanreason = "None"; if (strcmp $_kickbanaction kick) [ ] [ if (strcmp $_kickbanaction ban) [ ] [ _kickbanaction = ban ] ] ] +menuitem "intentional TK" [ _kickbanreason = "intentional TK"; showmenu (concat $_kickbanaction player) ] +menuitem "abusive behaviour" [ _kickbanreason = "abusive behaviour"; showmenu (concat $_kickbanaction player) ] +menuitem "bad language" [ _kickbanreason = "bad language"; showmenu (concat $_kickbanaction player) ] +// TODO: more reasons +//menuitem "" [ _kickbanreason = ""; showmenu (concat $_kickbanaction player) ] +menuitemtextinput "Reason: " "" "_kickbanreason = $arg1" "" 255 +menuitem $_kickbanaction "showmenu (concat $_kickbanaction player)" +menuinitselection 2 -menuitem "Kick a player" [ showmenu "kick player" ] -menuitem "Ban a player" [ showmenu "ban player" ] +newmenu kick/ban +menuitem "Kick a player" [ _kickbanaction = kick; showmenu reason ] +menuitem "Ban a player" [ _kickbanaction = ban; showmenu reason ] +//menuitem "Kick a player" [ showmenu "kick player" ] +//menuitem "Ban a player" [ showmenu "ban player" ] menuitem "Remove all bans" "removebans" newmenu "Team adjustment" diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 31bed57a..8a2d2d79 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -1261,7 +1261,6 @@ void *kickmenu = NULL, *banmenu = NULL, *forceteammenu = NULL, *giveadminmenu = void refreshsopmenu(void *menu, bool init) { - //TODO: add a text-field for giving a reason menureset(menu); mlines.shrink(0); mlines.reserve(players.length()); @@ -1269,8 +1268,9 @@ void refreshsopmenu(void *menu, bool init) { mline &m = mlines.add(); copystring(m.name, colorname(players[i])); - //formatstring(m.cmd)("%s %d%s", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "giveadmin")), i, (menu==kickmenu||menu==banmenu)?" NONE":""); - formatstring(m.cmd)("%s %d", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "giveadmin")), i); + string kbr; + if(getalias("_kickbanreason")!=NULL) formatstring(kbr)(" [ %s ]", getalias("_kickbanreason")); // leading space! + formatstring(m.cmd)("%s %d%s", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "giveadmin")), i, (menu==kickmenu||menu==banmenu)?(strlen(kbr)>4?kbr:" NONE"):""); // 4==3+space menumanual(menu, m.name, m.cmd); } }