edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix super bug

Browse source
This commit is contained in:
def 2014-01-22 00:12:24 +01:00
parent f0d79b8388
commit 11dc90206b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/gamecore.cpp
View file

@ -576,7 +576,7 @@ void CCharacterCore::Quantize()
bool CCharacterCore::IsRightTeam(int MapIndex) bool CCharacterCore::IsRightTeam(int MapIndex)
{ {
if(Collision()->m_pSwitchers) if(Collision()->m_pSwitchers)
if(m_pTeams->Team(m_Id) != m_pTeams->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) if(m_pTeams->Team(m_Id) != (m_pTeams->m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER))
return Collision()->m_pSwitchers[Collision()->GetDTileNumber(MapIndex)].m_Status[m_pTeams->Team(m_Id)]; return Collision()->m_pSwitchers[Collision()->GetDTileNumber(MapIndex)].m_Status[m_pTeams->Team(m_Id)];
return false; return false;
} }

2
src/game/teamscore.cpp
View file

@ -23,7 +23,7 @@ void CTeamsCore::Team(int ClientID, int Team)
bool CTeamsCore::CanCollide(int ClientID1, int ClientID2) bool CTeamsCore::CanCollide(int ClientID1, int ClientID2)
{ {
if (m_Team[ClientID1] == m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER || m_Team[ClientID2] == m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER if (m_Team[ClientID1] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER) || m_Team[ClientID2] == (m_IsDDRace16 ? VANILLA_TEAM_SUPER : TEAM_SUPER)
|| ClientID1 == ClientID2) || ClientID1 == ClientID2)
return true; return true;
if (m_IsSolo[ClientID1] || m_IsSolo[ClientID2]) if (m_IsSolo[ClientID1] || m_IsSolo[ClientID2])