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

28
src/game/client/ClientGame.cpp
View File

@@ -1,7 +1,6 @@
#include "game/client/ClientGame.h"
#include "protocol/PacketDispatcher.h"
#include "game/client/Client.h"
#include "misc/DiscordRPC.h"
namespace td {
namespace client {
@@ -98,7 +97,7 @@ void ClientGame::HandlePacket(const protocol::UpdateExpPacket* packet) {
}
void ClientGame::HandlePacket(const protocol::DisconnectPacket* packet) {
SetGameState(game::GameState::Disconnected);
m_GameState = game::GameState::Disconnected;
m_Renderer->SetBackgroundColor({ 0, 0, 0 });
}
@@ -115,30 +114,5 @@ void ClientGame::RenderWorld() {
}
}
void ClientGame::SetGameState(game::GameState newState) {
game::Game::SetGameState(newState);
// Update Discord presence
switch (newState) {
case game::GameState::Lobby:
utils::UpdateDiscordPresence("In Lobby", "Normal Mode", true);
break;
case game::GameState::Game:
utils::UpdateDiscordPresence("In Game", "Normal Mode", true);
break;
case game::GameState::Closed:
case game::GameState::Disconnected:
utils::UpdateDiscordPresence("In Main Menu", "Normal Mode", true);
break;
case game::GameState::EndGame:
utils::UpdateDiscordPresence("In End Game", "Normal Mode", true);
break;
}
}
} // namespace client
} // namespace td