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
+8 -3
View File
@@ -132,8 +132,6 @@ public MenuHandler_Map(Handle:menu, MenuAction:action, param1, param2)
else // no action was selected. else // no action was selected.
{ {
/* Re-enable the menu option */ /* Re-enable the menu option */
g_VoteMapInUse = false;
ResetMenu(); ResetMenu();
} }
} }
@@ -187,10 +185,17 @@ public AdminMenu_VoteMap(Handle:topmenu,
} }
else if (action == TopMenuAction_SelectOption) else if (action == TopMenuAction_SelectOption)
{ {
g_VoteMapInUse = true; if (!g_VoteMapInUse)
{
ResetMenu(); ResetMenu();
g_VoteMapInUse = true;
DisplayMenu(g_MapList, param, MENU_TIME_FOREVER); DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
} }
else
{
PrintToChat(param, "[SM] %T", "Map Vote In Use", param);
}
}
else if (action == TopMenuAction_DrawOption) else if (action == TopMenuAction_DrawOption)
{ {
/* disable this option if a vote is already running, theres no maps listed or someone else has already acessed this menu */ /* disable this option if a vote is already running, theres no maps listed or someone else has already acessed this menu */
+8
View File
@@ -29,6 +29,11 @@
"en" "Map Vote: {1}" "en" "Map Vote: {1}"
} }
"Map Vote In Use"
{
"en" "Another admin is currently using the map vote menu."
}
"Change Map To" "Change Map To"
{ {
"#format" "{1:s}" "#format" "{1:s}"
@@ -68,14 +73,17 @@
{ {
"en" "Kick vote" "en" "Kick vote"
} }
"Ban vote" "Ban vote"
{ {
"en" "Ban vote" "en" "Ban vote"
} }
"Map vote" "Map vote"
{ {
"en" "Map vote" "en" "Map vote"
} }
"Confirm Vote" "Confirm Vote"
{ {
"en" "Confirm Vote" "en" "Confirm Vote"