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

Fix: No ninja in solo

Browse source
This commit is contained in:
def 2013-08-04 22:50:14 +02:00
parent 05d2cb8383
commit 02ac497531
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/server/entities/character.cpp
View file

@ -165,11 +165,23 @@ void CCharacter::HandleNinja()
vec2 Center = OldPos + Dir * 0.5f;
int Num = GameServer()->m_World.FindEntities(Center, Radius, (CEntity**)aEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
// check that we're not in solo part
if (Teams()->m_Core.GetSolo(m_pPlayer->GetCID()))
return;
for (int i = 0; i < Num; ++i)
{
if (aEnts[i] == this)
continue;
// Don't hit players in other teams
if (Team() != aEnts[i]->Team())
continue;
// Don't hit players in solo parts
if (Teams()->m_Core.GetSolo(aEnts[i]->m_pPlayer->GetCID()))
return;
// make sure we haven't Hit this object before
bool bAlreadyHit = false;
for (int j = 0; j < m_NumObjectsHit; j++)
@ -184,10 +196,6 @@ void CCharacter::HandleNinja()
if (distance(aEnts[i]->m_Pos, m_Pos) > (m_ProximityRadius * 2.0f))
continue;
// Don't hit players in other teams
if (Team() != aEnts[i]->Team())
continue;
// Hit a player, give him damage and stuffs...
GameServer()->CreateSound(aEnts[i]->m_Pos, SOUND_NINJA_HIT, Teams()->TeamMask(Team(), -1, m_pPlayer->GetCID()));
// set his velocity to fast upward (for now)