diff --git a/src/game/server/entities/dragger.cpp b/src/game/server/entities/dragger.cpp index c47956a32..34746cf64 100644 --- a/src/game/server/entities/dragger.cpp +++ b/src/game/server/entities/dragger.cpp @@ -9,7 +9,7 @@ #include "dragger.h" CDragger::CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool NW, - int CatchedTeam, int Layer, int Number) : + int CaughtTeam, int Layer, int Number) : CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER) { m_Layer = Layer; @@ -18,7 +18,7 @@ CDragger::CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool NW, m_Strength = Strength; m_EvalTick = Server()->Tick(); m_NW = NW; - m_CatchedTeam = CatchedTeam; + m_CaughtTeam = CaughtTeam; GameWorld()->InsertEntity(this); for (int i = 0; i < MAX_CLIENTS; i++) @@ -48,7 +48,7 @@ void CDragger::Move() for (int i = 0; i < Num; i++) { Temp = m_SoloEnts[i]; - if (Temp->Team() != m_CatchedTeam) + if (Temp->Team() != m_CaughtTeam) { m_SoloEnts[i] = 0; continue; @@ -259,7 +259,7 @@ void CDragger::Reset() void CDragger::Tick() { if (((CGameControllerDDRace*) GameServer()->m_pController)->m_Teams.GetTeamState( - m_CatchedTeam) == CGameTeams::TEAMSTATE_EMPTY) + m_CaughtTeam) == CGameTeams::TEAMSTATE_EMPTY) return; if (Server()->Tick() % int(Server()->TickSpeed() * 0.15f) == 0) { @@ -282,7 +282,7 @@ void CDragger::Tick() void CDragger::Snap(int SnappingClient) { if (((CGameControllerDDRace*) GameServer()->m_pController)->m_Teams.GetTeamState( - m_CatchedTeam) == CGameTeams::TEAMSTATE_EMPTY) + m_CaughtTeam) == CGameTeams::TEAMSTATE_EMPTY) return; CCharacter *Target = m_Target; @@ -332,13 +332,13 @@ void CDragger::Snap(int SnappingClient) continue; if (Char && Char->IsAlive()) { - if (Char->Team() != m_CatchedTeam) + if (Char->Team() != m_CaughtTeam) continue; } else { // send to spectators only active draggers and some inactive from team 0 - if (!((Target && Target->IsAlive()) || m_CatchedTeam == 0)) + if (!((Target && Target->IsAlive()) || m_CaughtTeam == 0)) continue; } diff --git a/src/game/server/entities/dragger.h b/src/game/server/entities/dragger.h index 432fcadcb..8036aec01 100644 --- a/src/game/server/entities/dragger.h +++ b/src/game/server/entities/dragger.h @@ -14,14 +14,14 @@ class CDragger: public CEntity void Drag(); CCharacter * m_Target; bool m_NW; - int m_CatchedTeam; + int m_CaughtTeam; CCharacter * m_SoloEnts[MAX_CLIENTS]; int m_SoloIDs[MAX_CLIENTS]; public: CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool NW, - int CatchedTeam, int Layer = 0, int Number = 0); + int CaughtTeam, int Layer = 0, int Number = 0); virtual void Reset(); virtual void Tick();