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

Remove CFlag dead code (fixes #5677)

Browse source
This commit is contained in:
def 2022-07-30 13:39:05 +02:00
parent a57063fa77
commit fc5cfb6f6c
3 changed files with 0 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -2307,8 +2307,6 @@ if(SERVER)
entities/dragger.h
entities/dragger_beam.cpp
entities/dragger_beam.h
entities/flag.cpp
entities/flag.h
entities/gun.cpp
entities/gun.h
entities/laser.cpp

47
src/game/server/entities/flag.cpp
View file

@ -1,47 +0,0 @@
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */
/*
#include "flag.h"
#include <game/server/gamecontext.h>
CFlag::CFlag(CGameWorld *pGameWorld, int Team)
: CEntity(pGameWorld, CGameWorld::ENTTYPE_FLAG)
{
m_Team = Team;
m_ProximityRadius = ms_PhysSize;
m_pCarryingCharacter = NULL;
m_GrabTick = 0;
Reset();
}
void CFlag::Reset()
{
m_pCarryingCharacter = NULL;
m_AtStand = 1;
m_Pos = m_StandPos;
m_Vel = vec2(0,0);
m_GrabTick = 0;
}
void CFlag::TickPaused()
{
++m_DropTick;
if(m_GrabTick)
++m_GrabTick;
}
void CFlag::Snap(int SnappingClient)
{
if(NetworkClipped(SnappingClient))
return;
CNetObj_Flag *pFlag = (CNetObj_Flag *)Server()->SnapNewItem(NETOBJTYPE_FLAG, m_Team, sizeof(CNetObj_Flag));
if(!pFlag)
return;
pFlag->m_X = (int)m_Pos.x;
pFlag->m_Y = (int)m_Pos.y;
pFlag->m_Team = m_Team;
}
*/

30
src/game/server/entities/flag.h
View file

@ -1,30 +0,0 @@
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */
/*
#ifndef GAME_SERVER_ENTITIES_FLAG_H
#define GAME_SERVER_ENTITIES_FLAG_H
#include <game/server/entity.h>
class CFlag : public CEntity
{
public:
static const int ms_PhysSize = 14;
CCharacter *m_pCarryingCharacter;
vec2 m_Vel;
vec2 m_StandPos;
int m_Team;
int m_AtStand;
int m_DropTick;
int m_GrabTick;
CFlag(CGameWorld *pGameWorld, int Team);
virtual void Reset();
virtual void TickPaused();
virtual void Snap(int SnappingClient);
};
#endif
*/