Fix: bug with check C4 (CHalfLifeMultiplay::IsBombPlanted)

Cleanup: cosmetic changes
This commit is contained in:
s1lentq 2016-01-14 18:59:01 +06:00
parent 3170a9f26c
commit 51e921b0f6

View File

@ -1412,7 +1412,7 @@ bool CHalfLifeMultiplay::TeamExterminationCheck(int NumAliveTerrorist, int NumAl
{ {
if ((m_iNumCT > 0 && m_iNumSpawnableCT > 0) && (m_iNumTerrorist > 0 && m_iNumSpawnableTerrorist > 0)) if ((m_iNumCT > 0 && m_iNumSpawnableCT > 0) && (m_iNumTerrorist > 0 && m_iNumSpawnableTerrorist > 0))
{ {
if (!NumAliveTerrorist && NumDeadTerrorist && NumAliveCT > 0) if (NumAliveTerrorist == 0 && NumDeadTerrorist != 0 && NumAliveCT > 0)
{ {
CBaseEntity *temp = NULL; CBaseEntity *temp = NULL;
bool nowin = false; bool nowin = false;
@ -3023,7 +3023,7 @@ bool CHalfLifeMultiplay::IsBombPlanted(void)
{ {
CGrenade *bomb = NULL; CGrenade *bomb = NULL;
if ((bomb = (CGrenade *)UTIL_FindEntityByClassname(bomb, "grenade")) != NULL) while ((bomb = (CGrenade *)UTIL_FindEntityByClassname(bomb, "grenade")) != NULL)
{ {
if (bomb->m_bIsC4) if (bomb->m_bIsC4)
{ {
@ -3038,7 +3038,7 @@ bool CHalfLifeMultiplay::IsBombPlanted(void)
/* <115229> ../cstrike/dlls/multiplay_gamerules.cpp:2971 */ /* <115229> ../cstrike/dlls/multiplay_gamerules.cpp:2971 */
void CHalfLifeMultiplay::MarkLivingPlayersOnTeamAsNotReceivingMoneyNextRound(int iTeam) void CHalfLifeMultiplay::MarkLivingPlayersOnTeamAsNotReceivingMoneyNextRound(int iTeam)
{ {
for (int i = 1; i <= gpGlobals->maxClients; i++) for (int i = 1; i <= gpGlobals->maxClients; ++i)
{ {
CBasePlayer *player = reinterpret_cast<CBasePlayer *>(UTIL_PlayerByIndex(i)); CBasePlayer *player = reinterpret_cast<CBasePlayer *>(UTIL_PlayerByIndex(i));