LagCompensation: Cleanup

MakoVote: Don't put EX2 on cooldown
This commit is contained in:
BotoX 2019-11-13 21:02:36 +01:00
parent 7ad814607f
commit ad09bb338e
2 changed files with 670 additions and 748 deletions

File diff suppressed because it is too large Load Diff

View File

@ -23,7 +23,7 @@ bool g_bIsRevote = false;
bool bStartVoteNextRound = false; bool bStartVoteNextRound = false;
bool g_bOnCooldown[NUMBEROFSTAGES]; bool g_bOnCooldown[NUMBEROFSTAGES];
static char g_sStageName[NUMBEROFSTAGES][512] = {"Extreme 2", "Extreme 2 (Heal + Ultima)", "Extreme 3 (ZED)", "Extreme 3 (Hellz)", "Race Mode", "Zombie Mode"}; static char g_sStageName[NUMBEROFSTAGES][32] = {"Extreme 2", "Extreme 2 (Heal + Ultima)", "Extreme 3 (ZED)", "Extreme 3 (Hellz)", "Race Mode", "Zombie Mode"};
int g_Winnerstage; int g_Winnerstage;
Handle g_VoteMenu = INVALID_HANDLE; Handle g_VoteMenu = INVALID_HANDLE;
@ -42,7 +42,7 @@ public void OnMapStart()
bStartVoteNextRound = false; bStartVoteNextRound = false;
for (int i = 0; i <= (NUMBEROFSTAGES - 1); i++) for (int i = 0; i < NUMBEROFSTAGES; i++)
g_bOnCooldown[i] = false; g_bOnCooldown[i] = false;
} }
@ -197,12 +197,12 @@ public void GenerateArray()
int iBlockSize = ByteCountToCells(PLATFORM_MAX_PATH); int iBlockSize = ByteCountToCells(PLATFORM_MAX_PATH);
g_StageList = CreateArray(iBlockSize); g_StageList = CreateArray(iBlockSize);
for (int i = 0; i <= (NUMBEROFSTAGES - 1); i++) for (int i = 0; i < NUMBEROFSTAGES; i++)
PushArrayString(g_StageList, g_sStageName[i]); PushArrayString(g_StageList, g_sStageName[i]);
int iArraySize = GetArraySize(g_StageList); int iArraySize = GetArraySize(g_StageList);
for (int i = 0; i <= (iArraySize - 1); i++) for (int i = 0; i < iArraySize; i++)
{ {
int iRandom = GetRandomInt(0, iArraySize - 1); int iRandom = GetRandomInt(0, iArraySize - 1);
char sTemp1[128]; char sTemp1[128];
@ -218,11 +218,11 @@ public Action Command_StartVote(int args)
{ {
int iCurrentStage = GetCurrentStage(); int iCurrentStage = GetCurrentStage();
if (iCurrentStage > -1) if (iCurrentStage > 0)
g_bOnCooldown[iCurrentStage] = true; g_bOnCooldown[iCurrentStage] = true;
int iOnCD = 0; int iOnCD = 0;
for (int i = 0; i <= (NUMBEROFSTAGES - 1); i++) for (int i = 0; i < NUMBEROFSTAGES; i++)
{ {
if (g_bOnCooldown[i]) if (g_bOnCooldown[i])
iOnCD += 1; iOnCD += 1;
@ -230,7 +230,7 @@ public Action Command_StartVote(int args)
if (iOnCD >= 4) if (iOnCD >= 4)
{ {
for (int i = 0; i <= (NUMBEROFSTAGES - 1); i++) for (int i = 0; i < NUMBEROFSTAGES; i++)
g_bOnCooldown[i] = false; g_bOnCooldown[i] = false;
} }
@ -268,12 +268,12 @@ public void InitiateVote()
g_VoteMenu = CreateMenuEx(menuStyle, Handler_MakoVoteMenu, MenuAction_End | MenuAction_Display | MenuAction_DisplayItem | MenuAction_VoteCancel); g_VoteMenu = CreateMenuEx(menuStyle, Handler_MakoVoteMenu, MenuAction_End | MenuAction_Display | MenuAction_DisplayItem | MenuAction_VoteCancel);
int iArraySize = GetArraySize(g_StageList); int iArraySize = GetArraySize(g_StageList);
for (int i = 0; i <= (iArraySize - 1); i++) for (int i = 0; i < iArraySize; i++)
{ {
char sBuffer[128]; char sBuffer[128];
GetArrayString(g_StageList, i, sBuffer, sizeof(sBuffer)); GetArrayString(g_StageList, i, sBuffer, sizeof(sBuffer));
for (int j = 0; j <= (NUMBEROFSTAGES - 1); j++) for (int j = 0; j < NUMBEROFSTAGES; j++)
{ {
if (strcmp(sBuffer, g_sStageName[j]) == 0) if (strcmp(sBuffer, g_sStageName[j]) == 0)
{ {
@ -355,7 +355,7 @@ public void Handler_VoteFinishedGeneric(Handle menu, int num_votes, int num_clie
CPrintToChatAll("{green}[MakoVote] {white}Vote Finished! Winner: {red}%s{white} with %d%% of %d votes!", sWinner, RoundToFloor(fPercentage), num_votes); CPrintToChatAll("{green}[MakoVote] {white}Vote Finished! Winner: {red}%s{white} with %d%% of %d votes!", sWinner, RoundToFloor(fPercentage), num_votes);
for (int i = 0; i <= (NUMBEROFSTAGES - 1); i++) for (int i = 0; i < NUMBEROFSTAGES; i++)
{ {
if (strcmp(sWinner, g_sStageName[i]) == 0) if (strcmp(sWinner, g_sStageName[i]) == 0)
g_Winnerstage = i; g_Winnerstage = i;