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

Forgot to save

Browse source
This commit is contained in:
btd 2010-08-30 16:49:04 +04:00
parent 98a0a8f776
commit 6b9bbc2d0c
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

@ -226,7 +226,7 @@ void CCharacterCore::Tick(bool UseInput)
for(int i = 0; i < MAX_CLIENTS; i++)
{
CCharacterCore *p = m_pWorld->m_apCharacters[i];
if(!p || p == this || !m_pTeams.SameTeam(i, ThisId))
if(!p || p == this || !m_pTeams->SameTeam(i, ThisId))
continue;
vec2 ClosestPoint = closest_point_on_line(m_HookPos, NewPos, p->m_Pos);

2
src/game/server/entities/projectile.cpp
View file

@ -101,7 +101,7 @@ void CProjectile::Tick()
if( (TargetChr && (g_Config.m_SvHit || m_Owner == -1 || TargetChr == OwnerChar)) || Collide)//TODO:TEAM
{
if(OwnerChar != 0 && OwnerChar.m_isAlive && TargetChr.m_isAlive && OwnerChar->Team() != TargetChr->Team()) return;
if(!OwnerChar && OwnerChar->m_Alive && TargetChr->m_Alive && OwnerChar->Team() != TargetChr->Team()) return;
if(m_Explosive/*??*/ && (!TargetChr || (TargetChr && !m_Freeze)))
{
GameServer()->CreateExplosion(ColPos, m_Owner, m_Weapon, (m_Owner == -1)?true:false);