Revert "Merge branch 'discord'"

This reverts commit e7b9a57723, reversing changes made to 02b4aa3c91. Revert "moved rapidjson files" This reverts commit f5012f770c.
2023-06-21 23:30:35 +02:00
parent 1dde1dbf1e
commit 36f37b6548
57 changed files with 4 additions and 17185 deletions
--- a/include/game/BaseGame.h
+++ b/include/game/BaseGame.h
@@ -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; }