From f91d1eaa1921cf408f1000b6c7e507832e5bf51a Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Wed, 6 Jun 2007 02:27:18 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1150 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 6ad933b0..636f2948 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -653,7 +653,7 @@ COMMAND(mastermode, ARG_1INT); COMMAND(forceteam, ARG_1INT); COMMAND(givemaster, ARG_1INT); -struct mline { string cmd; }; +struct mline { string name, cmd; }; static vector mlines; void *kickmenu = NULL, *banmenu = NULL, *forceteammenu = NULL, *givemastermenu = NULL; @@ -664,9 +664,10 @@ void refreshsopmenu(void *menu, bool init) mlines.setsize(0); loopv(players) if(players[i]) { - string &s = mlines.add().cmd; - s_sprintf(s)("%s %d", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "givemaster")), i); - menumanual(menu, item++, colorname(players[i]), s); + mline &m = mlines.add(); + s_strcpy(m.name, colorname(players[i])); + s_sprintf(m.cmd)("%s %d", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "givemaster")), i); + menumanual(menu, item++, m.name, m.cmd); } }