reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-14 15:48:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Wrong counting of GetMapCount and typo in CHalfLifeMultiplay::ProcessMapVote

Browse Source
This commit is contained in:
s1lentq 2016-06-04 17:43:52 +06:00
parent c406141e47
commit 6115723666
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
regamedll/dlls/multiplay_gamerules.cpp
View File

@ -4483,22 +4483,22 @@ void CHalfLifeMultiplay::ResetAllMapVotes()
int GetMapCount()
{
static mapcycle_t mapcycle2;
static mapcycle_t mapcycle;
char *mapcfile = (char *)CVAR_GET_STRING("mapcyclefile");
DestroyMapCycle(&mapcycle2);
ReloadMapCycleFile(mapcfile, &mapcycle2);
DestroyMapCycle(&mapcycle);
ReloadMapCycleFile(mapcfile, &mapcycle);
int iCount = 0, iDone = 0;
for (mapcycle_item_s *item = mapcycle2.next_item; item != NULL && iDone != 1; item = item->next)
int nCount = 0;
auto item = mapcycle.next_item;
do
{
if (item == mapcycle2.next_item)
iDone = 1;
++nCount;
item = item->next;
} while (item != mapcycle.next_item);
++iCount;
}
return iCount;
return nCount;
}
void CHalfLifeMultiplay::DisplayMaps(CBasePlayer *player, int iVote)
@ -4561,7 +4561,6 @@ void CHalfLifeMultiplay::DisplayMaps(CBasePlayer *player, int iVote)
void CHalfLifeMultiplay::ProcessMapVote(CBasePlayer *player, int iVote)
{
CBaseEntity *pTempEntity = NULL;
int iValidVotes = 0, iNumPlayers = 0;
while ((pTempEntity = UTIL_FindEntityByClassname(pTempEntity, "player")) != NULL)
@ -4575,7 +4574,7 @@ void CHalfLifeMultiplay::ProcessMapVote(CBasePlayer *player, int iVote)
{
++iNumPlayers;
if (pTempPlayer->m_iMapVote = iVote)
if (pTempPlayer->m_iMapVote == iVote)
++iValidVotes;
}
}