Fix rare basevotes map vote problem (
bug 3905, r=dvander)
1.1 --- a/plugins/basevotes/votemap.sp Fri Nov 06 16:24:40 2009 -0600
1.2 +++ b/plugins/basevotes/votemap.sp Wed Nov 18 15:42:21 2009 -0800
1.3 @@ -132,8 +132,6 @@
1.4 else // no action was selected.
1.5 {
1.6 /* Re-enable the menu option */
1.7 - g_VoteMapInUse = false;
1.8 -
1.9 ResetMenu();
1.10 }
1.11 }
1.12 @@ -187,9 +185,16 @@
1.13 }
1.14 else if (action == TopMenuAction_SelectOption)
1.15 {
1.16 - g_VoteMapInUse = true;
1.17 - ResetMenu();
1.18 - DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
1.19 + if (!g_VoteMapInUse)
1.20 + {
1.21 + ResetMenu();
1.22 + g_VoteMapInUse = true;
1.23 + DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
1.24 + }
1.25 + else
1.26 + {
1.27 + PrintToChat(param, "[SM] %T", "Map Vote In Use", param);
1.28 + }
1.29 }
1.30 else if (action == TopMenuAction_DrawOption)
1.31 {
2.1 --- a/translations/basevotes.phrases.txt Fri Nov 06 16:24:40 2009 -0600
2.2 +++ b/translations/basevotes.phrases.txt Wed Nov 18 15:42:21 2009 -0800
2.3 @@ -28,6 +28,11 @@
2.4 "#format" "{1:s}"
2.5 "en" "Map Vote: {1}"
2.6 }
2.7 +
2.8 + "Map Vote In Use"
2.9 + {
2.10 + "en" "Another admin is currently using the map vote menu."
2.11 + }
2.12
2.13 "Change Map To"
2.14 {
2.15 @@ -68,14 +73,17 @@
2.16 {
2.17 "en" "Kick vote"
2.18 }
2.19 +
2.20 "Ban vote"
2.21 {
2.22 "en" "Ban vote"
2.23 }
2.24 +
2.25 "Map vote"
2.26 {
2.27 "en" "Map vote"
2.28 }
2.29 +
2.30 "Confirm Vote"
2.31 {
2.32 "en" "Confirm Vote"