UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed amb1065 - Votemap clears itself properly after a failed vote

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401647
This commit is contained in:
Matt Woodrow 2007-10-23 20:08:19 +00:00
parent 095dc2ec4b
commit 92ee426225
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/basevotes/votemap.sp
View File

@ -31,6 +31,21 @@ DisplayVoteMapMenu(client, mapCount, String:maps[5][])
VoteMenuToAll(g_hVoteMenu, 20); VoteMenuToAll(g_hVoteMenu, 20);
} }
ResetMenu()
{
/* Add the removed maps back to the menu */
new selectedmaps = GetArraySize(g_SelectedMaps);
decl String:mapname[64];
for (new i=0; i<selectedmaps; i++)
{
GetArrayString(g_SelectedMaps, i, mapname, sizeof(mapname)) ;
AddMenuItem(g_MapList, mapname, mapname);
}
g_VoteMapInUse = false;
}
ConfirmVote(client) ConfirmVote(client)
{ {
new Handle:menu = CreateMenu(MenuHandler_Confirm); new Handle:menu = CreateMenu(MenuHandler_Confirm);
@ -54,7 +69,8 @@ public MenuHandler_Confirm(Handle:menu, MenuAction:action, param1, param2)
} }
else if (action == MenuAction_Cancel) else if (action == MenuAction_Cancel)
{ {
g_VoteMapInUse = false; ResetMenu();
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE) if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
{ {
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory); DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
@ -72,8 +88,7 @@ public MenuHandler_Confirm(Handle:menu, MenuAction:action, param1, param2)
DisplayVoteMapMenu(param1, selectedmaps, maps); DisplayVoteMapMenu(param1, selectedmaps, maps);
/* Re-enable the menu option */ ResetMenu();
g_VoteMapInUse = false;
} }
} }
@ -81,16 +96,6 @@ public MenuHandler_Map(Handle:menu, MenuAction:action, param1, param2)
{ {
if (action == MenuAction_Cancel) if (action == MenuAction_Cancel)
{ {
/* Add the removed maps back to the menu */
new selectedmaps = GetArraySize(g_SelectedMaps);
decl String:mapname[64];
for (new i=0; i<selectedmaps; i++)
{
GetArrayString(g_SelectedMaps, i, mapname, sizeof(mapname)) ;
AddMenuItem(menu, mapname, mapname);
}
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE) if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
{ {
ConfirmVote(param1); ConfirmVote(param1);
@ -99,6 +104,8 @@ public MenuHandler_Map(Handle:menu, MenuAction:action, param1, param2)
{ {
/* Re-enable the menu option */ /* Re-enable the menu option */
g_VoteMapInUse = false; g_VoteMapInUse = false;
ResetMenu();
} }
} }
else if (action == MenuAction_Select) else if (action == MenuAction_Select)
@ -139,8 +146,8 @@ public AdminMenu_VoteMap(Handle:topmenu,
else if (action == TopMenuAction_SelectOption) else if (action == TopMenuAction_SelectOption)
{ {
g_VoteMapInUse = true; g_VoteMapInUse = true;
ClearArray(g_SelectedMaps);
g_SelectedCount = 0; g_SelectedCount = 0;
ClearArray(g_SelectedMaps);
DisplayMenu(g_MapList, param, MENU_TIME_FOREVER); DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
} }
else if (action == TopMenuAction_DrawOption) else if (action == TopMenuAction_DrawOption)