Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Revert "Merge branch 'discord'"

Browse Source 
This reverts commit e7b9a57723, reversing
changes made to 02b4aa3c91.

Revert "moved rapidjson files"

This reverts commit f5012f770c.
This commit is contained in:
Simon Pribylski
2023-06-21 23:30:35 +02:00
parent 1dde1dbf1e
commit 36f37b6548
57 changed files with 4 additions and 17185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/game/BaseGame.h
View File

@@ -52,7 +52,7 @@ public:
const Team& GetTeam(TeamColor team) const { return m_Teams[static_cast<std::uint8_t>(team)]; }
GameState GetGameState() const { return m_GameState; }
virtual void SetGameState(GameState gameState) { m_GameState = gameState; };
void SetGameState(GameState gameState) { m_GameState = gameState; };
const World* GetWorld() const { return m_World; }
World* GetWorld() { return m_World; }

2
include/game/client/ClientGame.h
View File

@@ -39,8 +39,6 @@ public:
render::Renderer* GetRenderer() const { return m_Renderer; }
WorldClient& GetWorldClient() { return m_WorldClient; }
void SetGameState(game::GameState gameState) override;
virtual void HandlePacket(const protocol::ConnexionInfoPacket* packet) override;
virtual void HandlePacket(const protocol::PlayerJoinPacket* packet) override;
virtual void HandlePacket(const protocol::PlayerLeavePacket* packet) override;