From 532ea85aebc9dc2ce6d87fe484766bf37ab40970 Mon Sep 17 00:00:00 2001 From: Choupom Date: Mon, 6 Sep 2010 12:29:28 +0200 Subject: separated CFlag from ctf --- src/game/server/gamemodes/ctf.cpp | 37 +------------------------------------ src/game/server/gamemodes/ctf.h | 19 ------------------- 2 files changed, 1 insertion(+), 55 deletions(-) (limited to 'src/game/server/gamemodes') diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index b28191af..353376e2 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -1,6 +1,7 @@ // copyright (c) 2007 magnus auvinen, see licence.txt for more info #include #include +#include #include #include #include "ctf.h" @@ -210,39 +211,3 @@ void CGameControllerCTF::Tick() } } } - -// Flag -CFlag::CFlag(CGameWorld *pGameWorld, int Team) -: CEntity(pGameWorld, NETOBJTYPE_FLAG) -{ - m_Team = Team; - m_ProximityRadius = ms_PhysSize; - m_pCarryingCharacter = 0x0; - m_GrabTick = 0; - - Reset(); -} - -void CFlag::Reset() -{ - m_pCarryingCharacter = 0x0; - m_AtStand = 1; - m_Pos = m_StandPos; - m_Vel = vec2(0,0); - m_GrabTick = 0; -} - -void CFlag::Snap(int SnappingClient) -{ - CNetObj_Flag *pFlag = (CNetObj_Flag *)Server()->SnapNewItem(NETOBJTYPE_FLAG, m_Team, sizeof(CNetObj_Flag)); - pFlag->m_X = (int)m_Pos.x; - pFlag->m_Y = (int)m_Pos.y; - pFlag->m_Team = m_Team; - pFlag->m_CarriedBy = -1; - - if(m_AtStand) - pFlag->m_CarriedBy = -2; - else if(m_pCarryingCharacter && m_pCarryingCharacter->GetPlayer()) - pFlag->m_CarriedBy = m_pCarryingCharacter->GetPlayer()->GetCID(); -} - diff --git a/src/game/server/gamemodes/ctf.h b/src/game/server/gamemodes/ctf.h index 16c6097a..f50509be 100644 --- a/src/game/server/gamemodes/ctf.h +++ b/src/game/server/gamemodes/ctf.h @@ -16,24 +16,5 @@ public: virtual int OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int Weapon); }; -// TODO: move to seperate file -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 Snap(int SnappingClient); -}; #endif -- cgit 1.4.1