From 164cb9907af9bc04a01f8198807b9ce87e013c1b Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Sat, 9 Jan 2021 17:18:52 +0300 Subject: [PATCH] player.h: Remove unused character.h include See the upstream commit 24bda2faa0a2b621aa24f3b1e2f6c6d6d9eabd9b --- src/game/server/ddracechat.cpp | 2 ++ src/game/server/ddracecommands.cpp | 1 + src/game/server/entities/door.cpp | 1 + src/game/server/entities/dragger.cpp | 2 ++ src/game/server/entities/gun.cpp | 1 + src/game/server/entities/laser.cpp | 2 ++ src/game/server/entities/light.cpp | 2 ++ src/game/server/entities/pickup.cpp | 2 ++ src/game/server/entities/plasma.cpp | 2 ++ src/game/server/entities/projectile.cpp | 2 ++ src/game/server/gamecontext.cpp | 1 + src/game/server/gamecontroller.cpp | 1 + src/game/server/gameworld.cpp | 1 + src/game/server/player.cpp | 1 + src/game/server/player.h | 1 - src/game/server/save.cpp | 1 + src/game/server/teams.cpp | 2 ++ 17 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp index 969fa7255..e771ad377 100644 --- a/src/game/server/ddracechat.cpp +++ b/src/game/server/ddracechat.cpp @@ -7,6 +7,8 @@ #include #include +#include "entities/character.h" + bool CheckClientID(int ClientID); void CGameContext::ConCredits(IConsole::IResult *pResult, void *pUserData) diff --git a/src/game/server/ddracecommands.cpp b/src/game/server/ddracecommands.cpp index fe24381fc..e3a10cc8e 100644 --- a/src/game/server/ddracecommands.cpp +++ b/src/game/server/ddracecommands.cpp @@ -1,6 +1,7 @@ /* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */ #include "gamecontext.h" #include +#include #include #include #include diff --git a/src/game/server/entities/door.cpp b/src/game/server/entities/door.cpp index 10eaea737..00f43c8b2 100644 --- a/src/game/server/entities/door.cpp +++ b/src/game/server/entities/door.cpp @@ -4,6 +4,7 @@ #include #include +#include "character.h" #include "door.h" CDoor::CDoor(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length, diff --git a/src/game/server/entities/dragger.cpp b/src/game/server/entities/dragger.cpp index 484293600..847d4151f 100644 --- a/src/game/server/entities/dragger.cpp +++ b/src/game/server/entities/dragger.cpp @@ -8,6 +8,8 @@ #include #include +#include "character.h" + CDragger::CDragger(CGameWorld *pGameWorld, vec2 Pos, float Strength, bool NW, int CaughtTeam, int Layer, int Number) : CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER) diff --git a/src/game/server/entities/gun.cpp b/src/game/server/entities/gun.cpp index 9def15802..438eb2375 100644 --- a/src/game/server/entities/gun.cpp +++ b/src/game/server/entities/gun.cpp @@ -5,6 +5,7 @@ #include #include +#include "character.h" #include "gun.h" #include "plasma.h" diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp index c3a70b6e7..5ed824b2e 100644 --- a/src/game/server/entities/laser.cpp +++ b/src/game/server/entities/laser.cpp @@ -8,6 +8,8 @@ #include #include +#include "character.h" + CLaser::CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEnergy, int Owner, int Type) : CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER) { diff --git a/src/game/server/entities/light.cpp b/src/game/server/entities/light.cpp index d2989fc6f..8d8c6b426 100644 --- a/src/game/server/entities/light.cpp +++ b/src/game/server/entities/light.cpp @@ -6,6 +6,8 @@ #include #include +#include "character.h" + CLight::CLight(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length, int Layer, int Number) : CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER) diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp index c75232169..1bed75d6d 100644 --- a/src/game/server/entities/pickup.cpp +++ b/src/game/server/entities/pickup.cpp @@ -6,6 +6,8 @@ #include +#include "character.h" + CPickup::CPickup(CGameWorld *pGameWorld, int Type, int SubType, int Layer, int Number) : CEntity(pGameWorld, CGameWorld::ENTTYPE_PICKUP) { diff --git a/src/game/server/entities/plasma.cpp b/src/game/server/entities/plasma.cpp index 6509565c2..c5e3b5417 100644 --- a/src/game/server/entities/plasma.cpp +++ b/src/game/server/entities/plasma.cpp @@ -7,6 +7,8 @@ #include #include +#include "character.h" + const float PLASMA_ACCEL = 1.1f; CPlasma::CPlasma(CGameWorld *pGameWorld, vec2 Pos, vec2 Dir, bool Freeze, diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp index 10a5e728b..12e89307c 100644 --- a/src/game/server/entities/projectile.cpp +++ b/src/game/server/entities/projectile.cpp @@ -8,6 +8,8 @@ #include #include +#include "character.h" + CProjectile::CProjectile( CGameWorld *pGameWorld, int Type, diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index b1046fc9c..1ef787007 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -23,6 +23,7 @@ #include #include +#include "entities/character.h" #include "gamemodes/DDRace.h" #include "score.h" diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 620c3068d..1ab221529 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -5,6 +5,7 @@ #include +#include "entities/character.h" #include "entities/pickup.h" #include "gamecontext.h" #include "gamecontroller.h" diff --git a/src/game/server/gameworld.cpp b/src/game/server/gameworld.cpp index 5cb93f3c6..2926c243b 100644 --- a/src/game/server/gameworld.cpp +++ b/src/game/server/gameworld.cpp @@ -2,6 +2,7 @@ /* If you are missing that file, acquire a complete release at teeworlds.com. */ #include "gameworld.h" +#include "entities/character.h" #include "entity.h" #include "gamecontext.h" #include diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 7e283f896..2da2061c4 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -4,6 +4,7 @@ #include #include +#include "entities/character.h" #include "gamecontext.h" #include "gamemodes/DDRace.h" #include diff --git a/src/game/server/player.h b/src/game/server/player.h index c21a02e1b..61efac4b3 100644 --- a/src/game/server/player.h +++ b/src/game/server/player.h @@ -4,7 +4,6 @@ #define GAME_SERVER_PLAYER_H // this include should perhaps be removed -#include "entities/character.h" #include "gamecontext.h" #include "score.h" #include "teeinfo.h" diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp index 6428ea2ce..b862671b3 100644 --- a/src/game/server/save.cpp +++ b/src/game/server/save.cpp @@ -3,6 +3,7 @@ #include #include +#include "entities/character.h" #include "gamemodes/DDRace.h" #include "teams.h" #include diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp index 8ed0b31b7..6a1b49ea1 100644 --- a/src/game/server/teams.cpp +++ b/src/game/server/teams.cpp @@ -4,6 +4,8 @@ #include "teehistorian.h" #include +#include "entities/character.h" + CGameTeams::CGameTeams(CGameContext *pGameContext) : m_pGameContext(pGameContext) {