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

Now lights affects on all hitted characters as doors

Browse source
This commit is contained in:
btd 2010-08-31 21:32:25 +04:00
parent 3264c57306
commit 2214a3cd0a
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/server/entities/door.h
View file

@ -8,6 +8,7 @@ class CTrigger;
class CDoor : public CEntity class CDoor : public CEntity
{ {
vec2 m_To; vec2 m_To;
int m_ActivatedTeam;
int m_EvalTick; int m_EvalTick;
bool m_Opened; bool m_Opened;
bool HitCharacter(); bool HitCharacter();

4
src/game/server/entities/gun.cpp
View file

@ -41,9 +41,7 @@ void CGun::Fire()
for (int i = 0; i < Num; i++) for (int i = 0; i < Num; i++)
{ {
CCharacter *Target = Ents[i]; CCharacter *Target = Ents[i];
int res=0; int res = GameServer()->Collision()->IntersectLine(m_Pos, Target->m_Pos,0,0,false);
vec2 coltile;
res = GameServer()->Collision()->IntersectLine(m_Pos, Target->m_Pos,0,0,false);
if (!res) if (!res)
{ {
int Len=length(Target->m_Pos - m_Pos); int Len=length(Target->m_Pos - m_Pos);

10
src/game/server/entities/light.cpp
View file

@ -28,10 +28,12 @@ CLight::CLight(CGameWorld *pGameWorld, vec2 pos, float rotation, int length)
bool CLight::hit_character() bool CLight::hit_character()
{ {
vec2 nothing; vec2 nothing;
CCharacter *hit = GameServer()->m_World.IntersectCharacter(m_Pos, to, 0.0f, nothing, 0); std::list < CCharacter * > hittedCharacters = GameServer()->m_World.IntersectedCharacters(m_Pos, to, 0.0f, nothing, 0);
if(!hit) if(hittedCharacters.empty()) return false;
return false; for(std::list < CCharacter * >::iterator i = hittedCharacters.begin(); i != hittedCharacters.end(); i++) {
hit->Freeze(Server()->TickSpeed()*3); CCharacter * Char = *i;
Char->Freeze(Server()->TickSpeed()*3);
}
return true; return true;
} }

2
src/game/server/gamecontext.cpp
View file

@ -145,7 +145,7 @@ void CGameContext::CreateExplosion(vec2 p, int Owner, int Weapon, bool NoDamage)
float Dmg = 6 * l; float Dmg = 6 * l;
if((int)Dmg) if((int)Dmg)
if((g_Config.m_SvHit||NoDamage) || Owner == apEnts[i]->m_pPlayer->GetCID()) if((g_Config.m_SvHit||NoDamage) || Owner == apEnts[i]->m_pPlayer->GetCID())
{ {//TODO: Change which explosion affects only on one team
if(Owner != -1 && apEnts[i]->m_Alive && apEnts[i]->Team() != GetPlayerChar(Owner)->Team()) continue; if(Owner != -1 && apEnts[i]->m_Alive && apEnts[i]->Team() != GetPlayerChar(Owner)->Team()) continue;
apEnts[i]->TakeDamage(ForceDir*Dmg*2, (int)Dmg, Owner, Weapon); apEnts[i]->TakeDamage(ForceDir*Dmg*2, (int)Dmg, Owner, Weapon);
if(!g_Config.m_SvHit||NoDamage) break; if(!g_Config.m_SvHit||NoDamage) break;