Port nominations.

This commit is contained in:
David Anderson 2014-11-09 16:11:36 -08:00
parent d68eea6dea
commit 59fbeb4f2c

View File

@ -46,8 +46,8 @@ public Plugin myinfo =
url = "http://www.sourcemod.net/" url = "http://www.sourcemod.net/"
}; };
Handle g_Cvar_ExcludeOld = null; ConVar g_Cvar_ExcludeOld;
Handle g_Cvar_ExcludeCurrent = null; ConVar g_Cvar_ExcludeCurrent;
Menu g_MapMenu = null; Menu g_MapMenu = null;
Handle g_MapList = null; Handle g_MapList = null;
@ -262,13 +262,13 @@ void BuildMapMenu()
ArrayList excludeMaps; ArrayList excludeMaps;
char currentMap[32]; char currentMap[32];
if (GetConVarBool(g_Cvar_ExcludeOld)) if (g_Cvar_ExcludeOld.BoolValue)
{ {
excludeMaps = ArrayList(ByteCountToCells(33)); excludeMaps = ArrayList(ByteCountToCells(33));
GetExcludeMapList(excludeMaps); GetExcludeMapList(excludeMaps);
} }
if (GetConVarBool(g_Cvar_ExcludeCurrent)) if (g_Cvar_ExcludeCurrent.BoolValue)
{ {
GetCurrentMap(currentMap, sizeof(currentMap)); GetCurrentMap(currentMap, sizeof(currentMap));
} }
@ -280,7 +280,7 @@ void BuildMapMenu()
GetArrayString(g_MapList, i, map, sizeof(map)); GetArrayString(g_MapList, i, map, sizeof(map));
if (GetConVarBool(g_Cvar_ExcludeCurrent)) if (g_Cvar_ExcludeCurrent.BoolValue)
{ {
if (StrEqual(map, currentMap)) if (StrEqual(map, currentMap))
{ {
@ -289,7 +289,7 @@ void BuildMapMenu()
} }
/* Dont bother with this check if the current map check passed */ /* Dont bother with this check if the current map check passed */
if (GetConVarBool(g_Cvar_ExcludeOld) && status == MAPSTATUS_ENABLED) if (g_Cvar_ExcludeOld.BoolValue && status == MAPSTATUS_ENABLED)
{ {
if (excludeMaps.FindString(map) != -1) if (excludeMaps.FindString(map) != -1)
{ {