Removed direct Game reference from Players header to speed up build

Arcidev · Aug 25, 2024 · de94574 · de94574
1 parent f9b8e22
commit de94574
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/Server/Server/ConnectedUser.cpp b/Server/Server/ConnectedUser.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include "ConnectedUser.h"
+#include "Game.h"
 #include "Player.h"
 #include "NetworkServices.h"
 #include "ServerNetwork.h"

diff --git a/Server/Server/PacketHandlers/CardHandler.cpp b/Server/Server/PacketHandlers/CardHandler.cpp
@@ -1,6 +1,7 @@
 #include "PacketHandler.h"
 #include "../ConnectedUser.h"
 #include "../DataHolder.h"
+#include "../Game.h"
 #include "../Player.h"
 #include "../Cards/PlayableCard.h"
 #include "../../Shared/SharedDefines.h"

diff --git a/Server/Server/PacketHandlers/ChatHandler.cpp b/Server/Server/PacketHandlers/ChatHandler.cpp
@@ -1,5 +1,6 @@
 #include "PacketHandler.h"
 #include "../ConnectedUser.h"
+#include "../Game.h"
 #include "../Player.h"
 #include "../ServerNetwork.h"
 #include "../../Shared/SharedDefines.h"

diff --git a/Server/Server/PacketHandlers/MiscHandler.cpp b/Server/Server/PacketHandlers/MiscHandler.cpp
@@ -1,5 +1,6 @@
 #include "PacketHandler.h"
 #include "../ConnectedUser.h"
+#include "../Game.h"
 #include "../Player.h"
 #include "../../Shared/SharedDefines.h"
 #include "../../Crypto/Aes.h"

diff --git a/Server/Server/Player.cpp b/Server/Server/Player.cpp
@@ -1,8 +1,9 @@
 #include <algorithm>
 #include <random>
-#include "Player.h"
 #include "ConnectedUser.h"
 #include "DataHolder.h"
+#include "Game.h"
+#include "Player.h"
 #include "ServerNetwork.h"
 #include "Cards/PlayableCard.h"
 #include "PacketHandlers/PacketHandler.h"
@@ -257,6 +258,16 @@ inline std::string_view Player::GetName() const
     return m_user->GetName();
 }
 
+inline Player* Player::GetOpponent() const
+{
+    return m_game->GetOpponent(this);
+}
+
+inline bool Player::IsActive() const
+{
+    return m_game->GetActivePlayer() == this;
+}
+
 void Player::SendGameInfo() const
 {
     Player const* opponent = GetOpponent();

diff --git a/Server/Server/Player.h b/Server/Server/Player.h
@@ -3,13 +3,13 @@
 #include <string>
 #include <vector>
 #include <list>
-#include "Game.h"
 #include "PlayerDefines.h"
 #include "Cards/CardDefines.h"
 #include "Spells/SpellDefines.h"
 
 class Card;
 class ConnectedUser;
+class Game;
 class Packet;
 class PlayableCard;
 class Spell;
@@ -67,7 +67,7 @@ class Player
         void Disconnect() const;
         void HandleDeckCards(bool addCard);
 
-        Player* GetOpponent() const { return m_game->GetOpponent(this); }
+        Player* GetOpponent() const;
         PlayableCard* GetCurrentCard();
         CardsMap const& GetCards() const { return m_cards; }
         std::vector<PlayableCard*> const& GetCurrentCards() const { return m_currentCards; }
@@ -78,5 +78,5 @@ class Player
         std::string_view GetName() const;
         ConnectedUser* GetUser() const { return m_user; }
         bool IsPrepared() const { return m_isPrepared; }
-        bool IsActive() const { return m_game->GetActivePlayer() == this; }
+        bool IsActive() const;
 };