Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #500 from diamante0018/main

Browse Source 
getinfo: use std::to_string where possible
This commit is contained in:
Maurice Heumann 2023-04-11 18:30:49 +02:00 committed by GitHub
commit 0205bea826
1 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
src/client/component/getinfo.cpp
View File

@ -1,125 +1,125 @@
#include <std_include.hpp> #include <std_include.hpp>
#include "loader/component_loader.hpp" #include "loader/component_loader.hpp"
#include "game/game.hpp" #include "game/game.hpp"
#include "steam/steam.hpp" #include "steam/steam.hpp"
#include "network.hpp" #include "network.hpp"
#include <utils/hook.hpp> #include <utils/hook.hpp>
#include <utils/string.hpp> #include <utils/string.hpp>
#include <utils/info_string.hpp> #include <utils/info_string.hpp>
#include <version.hpp> #include <version.hpp>
#include "game/utils.hpp" #include "game/utils.hpp"
namespace getinfo namespace getinfo
{ {
int get_max_client_count() int get_max_client_count()
{ {
return game::get_dvar_int("com_maxclients"); return game::get_dvar_int("com_maxclients");
} }
template <typename T> template <typename T>
int get_client_count(T* client_states) int get_client_count(T* client_states)
{ {
if (!client_states) if (!client_states)
{ {
return 0; return 0;
} }
int count = 0; int count = 0;
for (int i = 0; i < get_max_client_count(); ++i) for (int i = 0; i < get_max_client_count(); ++i)
{ {
if (client_states[i].client_state > 0) if (client_states[i].client_state > 0)
{ {
++count; ++count;
} }
} }
return count; return count;
} }
size_t get_client_count() size_t get_client_count()
{ {
size_t count = 0; size_t count = 0;
game::foreach_connected_client([&count](const game::client_s&) game::foreach_connected_client([&count](const game::client_s&)
{ {
++count; ++count;
}); });
return count; return count;
} }
size_t get_bot_count() size_t get_bot_count()
{ {
size_t count = 0; size_t count = 0;
game::foreach_connected_client([&count](const game::client_s&, const size_t index) game::foreach_connected_client([&count](const game::client_s&, const size_t index)
{ {
if (game::SV_IsTestClient(static_cast<int>(index))) if (game::SV_IsTestClient(static_cast<int>(index)))
{ {
++count; ++count;
} }
}); });
return count; return count;
} }
namespace namespace
{ {
int Com_SessionMode_GetGameMode() int Com_SessionMode_GetGameMode()
{ {
return *reinterpret_cast<int*>(game::select(0x1568ED7F4, 0x14948DB04)) << 14 >> 28; return *reinterpret_cast<int*>(game::select(0x1568ED7F4, 0x14948DB04)) << 14 >> 28;
} }
} }
int get_assigned_team() int get_assigned_team()
{ {
return (rand() % 2) + 1; return (rand() % 2) + 1;
} }
bool is_host() bool is_host()
{ {
return game::SV_Loaded() && (game::is_server() || !game::Com_IsRunningUILevel()); return game::SV_Loaded() && (game::is_server() || !game::Com_IsRunningUILevel());
} }
struct component final : generic_component struct component final : generic_component
{ {
void post_unpack() override void post_unpack() override
{ {
//utils::hook::jump(game::select(0x142254EF0, 0x140537730), get_assigned_team); //utils::hook::jump(game::select(0x142254EF0, 0x140537730), get_assigned_team);
network::on("getInfo", [](const game::netadr_t& target, const network::data_view& data) network::on("getInfo", [](const game::netadr_t& target, const network::data_view& data)
{ {
utils::info_string info{}; utils::info_string info{};
info.set("challenge", std::string(data.begin(), data.end())); info.set("challenge", std::string{ data.begin(), data.end() });
info.set("gamename", "T7"); info.set("gamename", "T7");
info.set("hostname", info.set("hostname",
game::get_dvar_string(game::is_server() ? "live_steam_server_name" : "sv_hostname")); game::get_dvar_string(game::is_server() ? "live_steam_server_name" : "sv_hostname"));
info.set("gametype", game::get_dvar_string("g_gametype")); info.set("gametype", game::get_dvar_string("g_gametype"));
//info.set("sv_motd", get_dvar_string("sv_motd")); //info.set("sv_motd", get_dvar_string("sv_motd"));
info.set("description", info.set("description",
game::is_server() ? game::get_dvar_string("live_steam_server_description") : ""); game::is_server() ? game::get_dvar_string("live_steam_server_description") : "");
info.set("xuid", utils::string::va("%llX", steam::SteamUser()->GetSteamID().bits)); info.set("xuid", utils::string::va("%llX", steam::SteamUser()->GetSteamID().bits));
info.set("mapname", game::get_dvar_string("mapname")); info.set("mapname", game::get_dvar_string("mapname"));
info.set("isPrivate", game::get_dvar_string("g_password").empty() ? "0" : "1"); info.set("isPrivate", game::get_dvar_string("g_password").empty() ? "0" : "1");
info.set("clients", utils::string::va("%zu", get_client_count())); info.set("clients", std::to_string(get_client_count()));
info.set("bots", utils::string::va("%zu", get_bot_count())); info.set("bots", std::to_string(get_bot_count()));
info.set("sv_maxclients", utils::string::va("%zu", get_max_client_count())); info.set("sv_maxclients", std::to_string(get_max_client_count()));
info.set("protocol", utils::string::va("%i", PROTOCOL)); info.set("protocol", std::to_string(PROTOCOL));
info.set("playmode", utils::string::va("%i", game::Com_SessionMode_GetMode())); info.set("playmode", std::to_string(game::Com_SessionMode_GetMode()));
info.set("gamemode", utils::string::va("%i", Com_SessionMode_GetGameMode())); info.set("gamemode", std::to_string(Com_SessionMode_GetGameMode()));
info.set("sv_running", utils::string::va("%i", game::is_server_running())); info.set("sv_running", std::to_string(game::is_server_running()));
info.set("dedicated", utils::string::va("%i", game::is_server() ? 1 : 0)); info.set("dedicated", game::is_server() ? "1" : "0");
info.set("hc", utils::string::va("%u", game::Com_GametypeSettings_GetUInt("hardcoremode", false))); info.set("hc", std::to_string(game::Com_GametypeSettings_GetUInt("hardcoremode", false)));
info.set("shortversion", SHORTVERSION); info.set("shortversion", SHORTVERSION);
network::send(target, "infoResponse", info.build(), '\n'); network::send(target, "infoResponse", info.build(), '\n');
}); });
} }
}; };
} }
REGISTER_COMPONENT(getinfo::component) REGISTER_COMPONENT(getinfo::component)