Merge branch 'discord'

This commit is contained in:
2023-06-08 12:21:54 +02:00
57 changed files with 17185 additions and 4 deletions

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; }
void SetGameState(GameState gameState) { m_GameState = gameState; };
virtual void SetGameState(GameState gameState) { m_GameState = gameState; };
const World* GetWorld() const { return m_World; }
World* GetWorld() { return m_World; }

View File

@@ -39,6 +39,8 @@ 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;

15
include/misc/DiscordRPC.h Normal file
View File

@@ -0,0 +1,15 @@
#pragma once
#include <string>
namespace td {
namespace utils {
void InitDiscordRPC();
void UpdateDiscordRPC();
void ShutdownDiscordRPC();
void UpdateDiscordPresence(const std::string& state, const std::string& details, bool resetTimer = false);
} // namespace utils
} // namespace td