Skip to content

Commit 3e60998

Browse files
committed
Remove discord integration toggle as it was broken
1 parent 8fa5293 commit 3e60998

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/engine/client/client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4904,7 +4904,7 @@ int main(int argc, const char **argv)
49044904
pKernel->RegisterInterface(pEngineMap); // IEngineMap
49054905
pKernel->RegisterInterface(static_cast<IMap *>(pEngineMap), false);
49064906

4907-
IDiscord *pDiscord = CreateDiscord(!g_Config.m_TcDiscordRPC);
4907+
IDiscord *pDiscord = CreateDiscord();
49084908
pKernel->RegisterInterface(pDiscord);
49094909

49104910
ISteam *pSteam = CreateSteam();

src/engine/client/discord.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ class CDiscordStub : public IDiscord
219219
void UpdatePlayerCount(int Count) override {}
220220
};
221221

222-
IDiscord *CreateDiscord(bool UseStub)
222+
IDiscord *CreateDiscord()
223223
{
224224
IDiscord *pDiscord = CreateDiscordImpl();
225-
if(pDiscord && !UseStub)
225+
if(pDiscord)
226226
{
227227
return pDiscord;
228228
}

src/engine/discord.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ class IDiscord : public IInterface
1919
virtual void UpdatePlayerCount(int Count) = 0;
2020
};
2121

22-
IDiscord *CreateDiscord(bool UseStub = false);
22+
IDiscord *CreateDiscord();
2323

2424
#endif // ENGINE_DISCORD_H

src/engine/shared/config_variables_tclient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ MACRO_CONFIG_STR(TcAutoVoteWhenFarMessage, tc_auto_vote_when_far_message, 128, "
212212
MACRO_CONFIG_INT(TcAutoVoteWhenFarTime, tc_auto_vote_when_far_time, 5, 0, 20, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How long until auto vote far happens")
213213

214214
// Integration
215-
MACRO_CONFIG_INT(TcDiscordRPC, tc_discord_rpc, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Toggle discord RPC (requires restart)")
215+
// MACRO_CONFIG_INT(TcDiscordRPC, tc_discord_rpc, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Toggle discord RPC (requires restart)") // broken
216216

217217
// Font
218218
MACRO_CONFIG_STR(TcCustomFont, tc_custom_font, 255, "DejaVu Sans", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Custom font face")

src/game/client/components/tclient/menus_tclient.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,10 +2176,10 @@ void CMenus::RenderSettingsTClientInfo(CUIRect MainView)
21762176
SetFlag(g_Config.m_TcTClientSettingsTabs, i, s_aShowTabs[i]);
21772177
}
21782178

2179-
RightView.HSplitTop(HeadlineHeight, &Label, &RightView);
2180-
Ui()->DoLabel(&Label, TCLocalize("Integration"), HeadlineFontSize, TEXTALIGN_ML);
2181-
RightView.HSplitTop(MarginSmall, nullptr, &RightView);
2182-
DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_TcDiscordRPC, TCLocalize("Enable Discord Integration"), &g_Config.m_TcDiscordRPC, &RightView, LineSize);
2179+
// RightView.HSplitTop(HeadlineHeight, &Label, &RightView);
2180+
// Ui()->DoLabel(&Label, TCLocalize("Integration"), HeadlineFontSize, TEXTALIGN_ML);
2181+
// RightView.HSplitTop(MarginSmall, nullptr, &RightView);
2182+
// DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_TcDiscordRPC, TCLocalize("Enable Discord Integration"), &g_Config.m_TcDiscordRPC, &RightView, LineSize);
21832183
}
21842184

21852185
void CMenus::RenderSettingsTClientProfiles(CUIRect MainView)

0 commit comments

Comments
 (0)