Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ServerList] Display bots separately

Browse Source
This commit is contained in:
momo5502 2017-06-12 21:01:56 +02:00
parent bd3c4c8aa1
commit d096a47f48
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Components/Modules/Party.cpp
View File

@ -295,6 +295,7 @@ namespace Components
// Basic info handler // Basic info handler
Network::Handle("getInfo", [] (Network::Address address, std::string data) Network::Handle("getInfo", [] (Network::Address address, std::string data)
{ {
int botCount = 0;
int clientCount = 0; int clientCount = 0;
int maxclientCount = *Game::svs_numclients; int maxclientCount = *Game::svs_numclients;
@ -304,7 +305,8 @@ namespace Components
{ {
if (Game::svs_clients[i].state >= 3) if (Game::svs_clients[i].state >= 3)
{ {
++clientCount; if (Game::svs_clients[i].isBot) ++botCount;
else ++clientCount;
} }
} }
} }
@ -323,6 +325,7 @@ namespace Components
info.set("fs_game", Dvar::Var("fs_game").get<const char*>()); info.set("fs_game", Dvar::Var("fs_game").get<const char*>());
info.set("xuid", Utils::String::VA("%llX", Steam::SteamUser()->GetSteamID().bits)); info.set("xuid", Utils::String::VA("%llX", Steam::SteamUser()->GetSteamID().bits));
info.set("clients", Utils::String::VA("%i", clientCount)); info.set("clients", Utils::String::VA("%i", clientCount));
info.set("bots", Utils::String::VA("%i", botCount));
info.set("sv_maxclients", Utils::String::VA("%i", maxclientCount)); info.set("sv_maxclients", Utils::String::VA("%i", maxclientCount));
info.set("protocol", Utils::String::VA("%i", PROTOCOL)); info.set("protocol", Utils::String::VA("%i", PROTOCOL));
info.set("shortversion", SHORTVERSION); info.set("shortversion", SHORTVERSION);

3
src/Components/Modules/ServerList.cpp
View File

@ -103,7 +103,7 @@ namespace Components
case Column::Players: case Column::Players:
{ {
return Utils::String::VA("%i (%i)", server->clients, server->maxClients); return Utils::String::VA("%i/%i (%i)", server->clients, server->maxClients, server->bots);
} }
case Column::Gametype: case Column::Gametype:
@ -460,6 +460,7 @@ namespace Components
server.mod = info.get("fs_game"); server.mod = info.get("fs_game");
server.matchType = atoi(info.get("matchtype").data()); server.matchType = atoi(info.get("matchtype").data());
server.clients = atoi(info.get("clients").data()); server.clients = atoi(info.get("clients").data());
server.bots = atoi(info.get("bots").data());
server.securityLevel = atoi(info.get("securityLevel").data()); server.securityLevel = atoi(info.get("securityLevel").data());
server.maxClients = atoi(info.get("sv_maxclients").data()); server.maxClients = atoi(info.get("sv_maxclients").data());
server.password = (atoi(info.get("isPrivate").data()) != 0); server.password = (atoi(info.get("isPrivate").data()) != 0);

1
src/Components/Modules/ServerList.hpp
View File

@ -20,6 +20,7 @@ namespace Components
std::string mod; std::string mod;
std::string shortversion; std::string shortversion;
int clients; int clients;
int bots;
int maxClients; int maxClients;
bool password; bool password;
int ping; int ping;