Remove support for %name% replacement in plmenu (bug 6578).

This commit is contained in:
Nicholas Hastings 2017-01-21 22:58:03 -05:00
parent 56210f3e96
commit ed672847f3
4 changed files with 4 additions and 12 deletions

View File

@ -619,14 +619,12 @@ public actionClcmdMenu(id,key) {
new player = g_menuPlayers[id][g_menuPosition[id] * 7 + key] new player = g_menuPlayers[id][g_menuPosition[id] * 7 + key]
new flags = g_clcmdMisc[g_menuSelect[id][g_menuOption[id]]][1] new flags = g_clcmdMisc[g_menuSelect[id][g_menuOption[id]]][1]
if (is_user_connected(player)) { if (is_user_connected(player)) {
new command[64], authid[32], name[MAX_NAME_LENGTH], userid[32] new command[64], authid[32], userid[32]
copy(command,charsmax(command),g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]]) copy(command,charsmax(command),g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]])
get_user_authid(player,authid,charsmax(authid)) get_user_authid(player,authid,charsmax(authid))
get_user_name(player,name,charsmax(name))
num_to_str(get_user_userid(player),userid,charsmax(userid)) num_to_str(get_user_userid(player),userid,charsmax(userid))
replace(command,charsmax(command),"%userid%",userid) replace(command,charsmax(command),"%userid%",userid)
replace(command,charsmax(command),"%authid%",authid) replace(command,charsmax(command),"%authid%",authid)
replace(command,charsmax(command),"%name%",name)
if (flags & 1) { if (flags & 1) {
server_cmd("%s", command) server_cmd("%s", command)
server_exec() server_exec()

View File

@ -820,16 +820,14 @@ public actionClcmdMenu(id, key)
if (is_user_connected(player)) if (is_user_connected(player))
{ {
new command[64], authid[32], name[MAX_NAME_LENGTH], userid[32] new command[64], authid[32], userid[32]
copy(command, charsmax(command), g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]]) copy(command, charsmax(command), g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]])
get_user_authid(player, authid, charsmax(authid)) get_user_authid(player, authid, charsmax(authid))
get_user_name(player, name, charsmax(name))
num_to_str(get_user_userid(player), userid, charsmax(userid)) num_to_str(get_user_userid(player), userid, charsmax(userid))
replace(command, charsmax(command), "%userid%", userid) replace(command, charsmax(command), "%userid%", userid)
replace(command, charsmax(command), "%authid%", authid) replace(command, charsmax(command), "%authid%", authid)
replace(command, charsmax(command), "%name%", name)
if (flags & 1) if (flags & 1)
{ {

View File

@ -1067,16 +1067,14 @@ public actionClcmdMenu(id, key)
if (is_user_connected(player)) if (is_user_connected(player))
{ {
new command[512], authid[32], name[MAX_NAME_LENGTH], userid[32]; new command[512], authid[32], userid[32];
copy(command, charsmax(command), g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]]); copy(command, charsmax(command), g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]]);
get_user_authid(player, authid, charsmax(authid)); get_user_authid(player, authid, charsmax(authid));
get_user_name(player, name, charsmax(name));
num_to_str(get_user_userid(player), userid, charsmax(userid)); num_to_str(get_user_userid(player), userid, charsmax(userid));
replace(command, charsmax(command), "%userid%", userid); replace(command, charsmax(command), "%userid%", userid);
replace(command, charsmax(command), "%authid%", authid); replace(command, charsmax(command), "%authid%", authid);
replace(command, charsmax(command), "%name%", name);
if (flags & 1) if (flags & 1)
{ {

View File

@ -626,14 +626,12 @@ public actionClcmdMenu(id,key) {
new player = g_menuPlayers[id][g_menuPosition[id] * 7 + key] new player = g_menuPlayers[id][g_menuPosition[id] * 7 + key]
new flags = g_clcmdMisc[g_menuSelect[id][g_menuOption[id]]][1] new flags = g_clcmdMisc[g_menuSelect[id][g_menuOption[id]]][1]
if (is_user_connected(player)) { if (is_user_connected(player)) {
new command[64], authid[32], name[MAX_NAME_LENGTH], userid[32] new command[64], authid[32], userid[32]
copy(command,charsmax(command),g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]]) copy(command,charsmax(command),g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]])
get_user_authid(player,authid,charsmax(authid)) get_user_authid(player,authid,charsmax(authid))
get_user_name(player,name,charsmax(name))
num_to_str(get_user_userid(player),userid,charsmax(userid)) num_to_str(get_user_userid(player),userid,charsmax(userid))
replace(command,charsmax(command),"%userid%",userid) replace(command,charsmax(command),"%userid%",userid)
replace(command,charsmax(command),"%authid%",authid) replace(command,charsmax(command),"%authid%",authid)
replace(command,charsmax(command),"%name%",name)
if (flags & 1) { if (flags & 1) {
server_cmd("%s", command) server_cmd("%s", command)
server_exec() server_exec()