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

Fix ValveSoftware/halflife#197

Browse Source
This commit is contained in:
s1lentq 2016-09-27 03:49:34 +07:00
parent 1423f7e3fa
commit 3c805aae95
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
regamedll/dlls/maprules.cpp
View File

@ -256,7 +256,15 @@ void CGameTeamMaster::__MAKE_VHOOK(Use)(CBaseEntity *pActivator, CBaseEntity *pC
} }
else else
{ {
#ifdef REGAMEDLL_FIXES
CBasePlayer *pPlayer = static_cast<CBasePlayer *>(pActivator);
if (pPlayer->IsPlayer())
m_teamIndex = pPlayer->m_iTeam;
else
m_teamIndex = -1;
#else
m_teamIndex = g_pGameRules->GetTeamIndex(pActivator->TeamID()); m_teamIndex = g_pGameRules->GetTeamIndex(pActivator->TeamID());
#endif
} }
return; return;
@ -287,7 +295,11 @@ const char *CGameTeamMaster::__MAKE_VHOOK(TeamID)()
} }
// UNDONE: Fill this in with the team from the "teamlist" // UNDONE: Fill this in with the team from the "teamlist"
#ifdef REGAMEDLL_FIXES
return GetTeamName(m_teamIndex);
#else
return g_pGameRules->GetIndexedTeamName(m_teamIndex); return g_pGameRules->GetIndexedTeamName(m_teamIndex);
#endif
} }
BOOL CGameTeamMaster::TeamMatch(CBaseEntity *pActivator) BOOL CGameTeamMaster::TeamMatch(CBaseEntity *pActivator)
@ -298,7 +310,15 @@ BOOL CGameTeamMaster::TeamMatch(CBaseEntity *pActivator)
if (!pActivator) if (!pActivator)
return FALSE; return FALSE;
#ifdef REGAMEDLL_FIXES
CBasePlayer *pPlayer = static_cast<CBasePlayer *>(pActivator);
if (!pPlayer->IsPlayer())
return FALSE;
return pPlayer->m_iTeam == m_teamIndex;
#else
return UTIL_TeamsMatch(pActivator->TeamID(), TeamID()); return UTIL_TeamsMatch(pActivator->TeamID(), TeamID());
#endif
} }
LINK_ENTITY_TO_CLASS(game_team_set, CGameTeamSet, CCSGameTeamSet); LINK_ENTITY_TO_CLASS(game_team_set, CGameTeamSet, CCSGameTeamSet);
@ -310,10 +330,12 @@ void CGameTeamSet::__MAKE_VHOOK(Use)(CBaseEntity *pActivator, CBaseEntity *pCall
if (ShouldClearTeam()) if (ShouldClearTeam())
{ {
// clear the team of our target
SUB_UseTargets(pActivator, USE_SET, -1); SUB_UseTargets(pActivator, USE_SET, -1);
} }
else else
{ {
// set the team of our target to our activator's team
SUB_UseTargets(pActivator, USE_SET, 0); SUB_UseTargets(pActivator, USE_SET, 0);
} }