Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

discord presence changes + fix build

Browse Source
This commit is contained in:
m 2023-01-01 20:22:58 -06:00
parent 95715fb819
commit a3b1936f67
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/client/component/discord.cpp
View File

@ -4,6 +4,7 @@
#include "console.hpp" #include "console.hpp"
#include "command.hpp" #include "command.hpp"
#include "discord.hpp" #include "discord.hpp"
#include "fastfiles.hpp"
#include "materials.hpp" #include "materials.hpp"
#include "network.hpp" #include "network.hpp"
#include "party.hpp" #include "party.hpp"
@ -37,21 +38,21 @@ namespace discord
discord_presence.details = SELECT_VALUE("Singleplayer", "Multiplayer"); discord_presence.details = SELECT_VALUE("Singleplayer", "Multiplayer");
discord_presence.state = "Main Menu"; discord_presence.state = "Main Menu";
const auto in_firing_range = game::Dvar_FindVar("virtualLobbyInFiringRange");
if (in_firing_range && in_firing_range->current.enabled == 1)
{
discord_presence.state = "Firing Range";
}
discord_presence.partySize = 0; discord_presence.partySize = 0;
discord_presence.partyMax = 0; discord_presence.partyMax = 0;
discord_presence.startTimestamp = 0; discord_presence.startTimestamp = 0;
discord_presence.largeImageKey = SELECT_VALUE("menu_singleplayer", "menu_multiplayer"); discord_presence.largeImageKey = SELECT_VALUE("menu_singleplayer", "menu_multiplayer");
// set to blank when in lobby
discord_presence.matchSecret = ""; discord_presence.matchSecret = "";
discord_presence.joinSecret = ""; discord_presence.joinSecret = "";
discord_presence.partyId = ""; discord_presence.partyId = "";
const auto in_firing_range = game::Dvar_FindVar("virtualLobbyInFiringRange");
if (in_firing_range && in_firing_range->current.enabled == 1)
{
discord_presence.state = "Firing Range";
discord_presence.largeImageKey = "mp_vlobby_room";
}
} }
else else
{ {
@ -121,6 +122,11 @@ namespace discord
discord_presence.partyMax = max_clients; discord_presence.partyMax = max_clients;
discord_presence.state = clean_hostname; discord_presence.state = clean_hostname;
discord_presence.largeImageKey = map; discord_presence.largeImageKey = map;
if (!fastfiles::is_stock_map(map))
{
discord_presence.largeImageKey = "menu_multiplayer";
}
} }
else if (game::environment::is_sp()) else if (game::environment::is_sp())
{ {

2
src/client/component/party.cpp
View File

@ -911,7 +911,7 @@ namespace party
scheduler::once([]() scheduler::once([]()
{ {
sv_say_name = dvars::register_string("sv_sayName", "console", game::DvarFlags::DVAR_FLAG_NONE); sv_say_name = dvars::register_string("sv_sayName", "console", game::DvarFlags::DVAR_FLAG_NONE, "");
}, scheduler::pipeline::main); }, scheduler::pipeline::main);
command::add("tell", [](const command::params& params) command::add("tell", [](const command::params& params)