Fix rare basevotes map vote problem (bug 3905, r=dvander)

This commit is contained in:
Fyren 2009-11-18 15:42:21 -08:00
parent dc0ea197cd
commit b5d9b18da4
2 changed files with 18 additions and 5 deletions

View File

@ -132,8 +132,6 @@ public MenuHandler_Map(Handle:menu, MenuAction:action, param1, param2)
else // no action was selected.
{
/* Re-enable the menu option */
g_VoteMapInUse = false;
ResetMenu();
}
}
@ -187,9 +185,16 @@ public AdminMenu_VoteMap(Handle:topmenu,
}
else if (action == TopMenuAction_SelectOption)
{
g_VoteMapInUse = true;
ResetMenu();
DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
if (!g_VoteMapInUse)
{
ResetMenu();
g_VoteMapInUse = true;
DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
}
else
{
PrintToChat(param, "[SM] %T", "Map Vote In Use", param);
}
}
else if (action == TopMenuAction_DrawOption)
{

View File

@ -28,6 +28,11 @@
"#format" "{1:s}"
"en" "Map Vote: {1}"
}
"Map Vote In Use"
{
"en" "Another admin is currently using the map vote menu."
}
"Change Map To"
{
@ -68,14 +73,17 @@
{
"en" "Kick vote"
}
"Ban vote"
{
"en" "Ban vote"
}
"Map vote"
{
"en" "Map vote"
}
"Confirm Vote"
{
"en" "Confirm Vote"