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 plasmas

Browse source
This commit is contained in:
btd 2010-10-04 11:45:10 +04:00
parent c87a68b2ba
commit b07cc717d4
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ const int RANGE=700;
////////////////////////////////////////////////// //////////////////////////////////////////////////
// CGun // CGun
////////////////////////////////////////////////// //////////////////////////////////////////////////
CGun::CGun(CGameWorld *pGameWorld, vec2 Pos, int Freeze, bool Explosive) CGun::CGun(CGameWorld *pGameWorld, vec2 Pos, bool Freeze, bool Explosive)
: CEntity(pGameWorld, NETOBJTYPE_LASER) : CEntity(pGameWorld, NETOBJTYPE_LASER)
{ {
m_Delay = Server()->TickSpeed()*0.3f; m_Delay = Server()->TickSpeed()*0.3f;

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

@ -13,14 +13,14 @@ class CGun : public CEntity
int m_EvalTick; int m_EvalTick;
vec2 m_Core; vec2 m_Core;
int m_Freeze; bool m_Freeze;
bool m_Explosive; bool m_Explosive;
void Fire(); void Fire();
int m_Delay; int m_Delay;
public: public:
CGun(CGameWorld *pGameWorld, vec2 Pos, int Freeze, bool Explosive); CGun(CGameWorld *pGameWorld, vec2 Pos, bool Freeze, bool Explosive);
virtual void Reset(); virtual void Reset();
virtual void Tick(); virtual void Tick();

8
src/game/server/gamecontroller.cpp
View file

@ -273,19 +273,19 @@ bool IGameController::OnEntity(int Index, vec2 Pos, bool Front)
} }
else if(Index==ENTITY_PLASMAE) else if(Index==ENTITY_PLASMAE)
{ {
new CGun(&GameServer()->m_World, Pos, 0, true); new CGun(&GameServer()->m_World, Pos, false, true);
} }
else if(Index==ENTITY_PLASMAF) else if(Index==ENTITY_PLASMAF)
{ {
new CGun(&GameServer()->m_World, Pos, 1, false); new CGun(&GameServer()->m_World, Pos, true, false);
} }
else if(Index==ENTITY_PLASMA) else if(Index==ENTITY_PLASMA)
{ {
new CGun(&GameServer()->m_World, Pos, 1, true); new CGun(&GameServer()->m_World, Pos, true, true);
} }
else if(Index==ENTITY_PLASMAU) else if(Index==ENTITY_PLASMAU)
{ {
new CGun(&GameServer()->m_World, Pos, -1, false); new CGun(&GameServer()->m_World, Pos, false, false);
} }
if(Type != -1) if(Type != -1)
{ {