Skip to content

Fix: use direct Schema access instead of broken engine vtable calls #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tsukasa-Nefren wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: use direct Schema access instead of broken engine vtable calls #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions serverlistplayersfix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,15 @@ ICvar *icvar = NULL;
CSteamGameServerAPIContext g_steamAPI;
IServerGameDLL* server = NULL;
IVEngineServer* engine = NULL;
IServerGameClients* gameclients = NULL;
CGameEntitySystem* g_pEntitySystem = nullptr;

class CCSPlayerController : public CBasePlayerController
{
public:
DECLARE_SCHEMA_CLASS(CCSPlayerController);
SCHEMA_FIELD(int32_t, m_iScore)
};

CGameEntitySystem* GameEntitySystem()
{
#ifdef WIN32
Expand All @@ -69,7 +75,6 @@ bool ServerListPlayersFix::Load(PluginId id, ISmmAPI *ismm, char *error, size_t
GET_V_IFACE_ANY(GetServerFactory, g_pSource2Server, ISource2Server, SOURCE2SERVER_INTERFACE_VERSION);
GET_V_IFACE_ANY(GetServerFactory, server, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
GET_V_IFACE_ANY(GetServerFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
GET_V_IFACE_CURRENT(GetEngineFactory, g_pSchemaSystem, ISchemaSystem, SCHEMASYSTEM_INTERFACE_VERSION);
GET_V_IFACE_ANY(GetEngineFactory, g_pNetworkServerService, INetworkServerService, NETWORKSERVERSERVICE_INTERFACE_VERSION);
GET_V_IFACE_CURRENT(GetEngineFactory, g_pGameResourceServiceServer, IGameResourceService, GAMERESOURCESERVICESERVER_INTERFACE_VERSION);
Expand Down Expand Up @@ -105,12 +110,11 @@ void ServerListPlayersFix::UpdatePlayers()

for (int i = 0; i < gpGlobals->maxClients; i++)
{
auto steamId = engine->GetClientSteamID(CPlayerSlot(i));
if (steamId)
auto controller = (CCSPlayerController*)g_pEntitySystem->GetEntityInstance(CEntityIndex(i+1));
if (controller && controller->IsConnected() && controller->m_steamID() != 0)
{
auto controller = (CBasePlayerController*)g_pEntitySystem->GetEntityInstance(CEntityIndex(i+1));
if(controller)
g_steamAPI.SteamGameServer()->BUpdateUserData(*steamId, controller->GetPlayerName(), gameclients->GetPlayerScore(CPlayerSlot(i)));
CSteamID steamId(controller->m_steamID());
g_steamAPI.SteamGameServer()->BUpdateUserData(steamId, controller->GetPlayerName(), controller->m_iScore());
}
}
}
Expand Down
Loading