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

Distance can't be negative

Browse source
This commit is contained in:
fokkonaut 2020-01-04 16:32:51 +01:00
parent af6d463fb6
commit e2b252b714
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/gamecore.cpp
View file

@ -494,15 +494,7 @@ void CCharacterCore::Move()
if((!(pCharCore->m_Super || m_Super) && (m_Solo || pCharCore->m_Solo || !pCharCore->m_Collision || pCharCore->m_NoCollision || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, p)))))
continue;
float D = distance(Pos, pCharCore->m_Pos);
if(D < 28.0f && D > 0.0f)
{
if(a > 0.0f)
m_Pos = LastPos;
else if(distance(NewPos, pCharCore->m_Pos) > D)
m_Pos = NewPos;
return;
}
else if(D <= 0.001f && D >= -0.001f)
if((D < 28.0f && D > 0.0f) || (D <= 0.001f && D >= 0.f))
{
if(a > 0.0f)
m_Pos = LastPos;