plugins/mapchooser.sp
changeset 4218 0634bd808f0f
parent 4208 0da12c0f8095
child 4359 444f983b8356
     1.1 --- a/plugins/mapchooser.sp	Wed Jan 29 21:41:41 2014 -0700
     1.2 +++ b/plugins/mapchooser.sp	Thu Jan 30 14:29:53 2014 -0700
     1.3 @@ -99,7 +99,6 @@
     1.4  new bool:g_ChangeMapInProgress;
     1.5  new g_mapFileSerial = -1;
     1.6  
     1.7 -new g_NominateCount = 0;
     1.8  new MapChange:g_ChangeTime;
     1.9  
    1.10  new Handle:g_NominationsResetForward = INVALID_HANDLE;
    1.11 @@ -229,7 +228,6 @@
    1.12  	
    1.13  	g_MapVoteCompleted = false;
    1.14  	
    1.15 -	g_NominateCount = 0;
    1.16  	ClearArray(g_NominateList);
    1.17  	ClearArray(g_NominateOwners);
    1.18  	
    1.19 @@ -287,7 +285,6 @@
    1.20  	
    1.21  	RemoveFromArray(g_NominateOwners, index);
    1.22  	RemoveFromArray(g_NominateList, index);
    1.23 -	g_NominateCount--;
    1.24  }
    1.25  
    1.26  public Action:Command_SetNextmap(client, args)
    1.27 @@ -1003,14 +1000,13 @@
    1.28  	}
    1.29  	
    1.30  	/* Too many nominated maps. */
    1.31 -	if (g_NominateCount >= GetConVarInt(g_Cvar_IncludeMaps) && !force)
    1.32 +	if (GetArraySize(g_NominateList) >= GetConVarInt(g_Cvar_IncludeMaps) && !force)
    1.33  	{
    1.34  		return Nominate_VoteFull;
    1.35  	}
    1.36  	
    1.37  	PushArrayString(g_NominateList, map);
    1.38  	PushArrayCell(g_NominateOwners, owner);
    1.39 -	g_NominateCount++;
    1.40  	
    1.41  	while (GetArraySize(g_NominateList) > GetConVarInt(g_Cvar_IncludeMaps))
    1.42  	{
    1.43 @@ -1063,7 +1059,6 @@
    1.44  
    1.45  			RemoveFromArray(g_NominateList, i);
    1.46  			RemoveFromArray(g_NominateOwners, i);
    1.47 -			g_NominateCount--;
    1.48  
    1.49  			return true;
    1.50  		}
    1.51 @@ -1105,7 +1100,6 @@
    1.52  
    1.53  		RemoveFromArray(g_NominateList, index);
    1.54  		RemoveFromArray(g_NominateOwners, index);
    1.55 -		g_NominateCount--;
    1.56  
    1.57  		return true;
    1.58  	}