Skip to content

2025-11-04 CS2 update fixes & misc dev #402

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

Merged
Vauff merged 3 commits into from
Nov 5, 2025
Merged

2025-11-04 CS2 update fixes & misc dev #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c17dd08
Update patches for 2025-11-04 CS2 update
Vauff Nov 5, 2025
0cc0365
leader: change to std::vector (#397)
notkoen Nov 5, 2025
04930e3
Update SDK
Vauff Nov 5, 2025
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
6 changes: 3 additions & 3 deletions gamedata/cs2fixes.games.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"ServerMovementUnlock"
{
"library" "server"
"windows" "\x0F\x86\xB0\x2A\x2A\x2A\xF3\x0F\x58\xD4"
"linux" "\x0F\x87\x2A\x2A\x2A\x2A\xF3\x0F\x10\x35\x2A\x2A\x2A\x2A\xF3\x0F\x11\xB5\x2A\x2A\x2A\x2A\x48\x89\xDE"
"windows" "\x0F\x86\xB0\x2A\x2A\x2A\xF3\x0F\x58\xD3"
"linux" "\x0F\x87\x2A\x2A\x2A\x2A\xF3\x0F\x10\x35\x2A\x2A\x2A\x2A\xF3\x0F\x11\xB5\x2A\x2A\x2A\x2A\x4C\x89\xEE"
}
// String: "CCSPlayerPawnBase::SwitchTeam", just keep in mind this is actually CCSPlayerController::SwitchTeam
"CCSPlayerController_SwitchTeam"
Expand All @@ -57,7 +57,7 @@
{
"library" "server"
"windows" "\xC8\x42\xEB\x2A\x4C\x39\x67\x30"
"linux" "\xC8\x42\x41\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xE9\x2A\x2A\x2A\x2A\x48\x89\xDF"
"linux" "\xC8\x42\x41\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x41\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xE9"
}
// Called right after "Removed %s(%s)\n"
"UTIL_Remove"
Expand Down
2 changes: 1 addition & 1 deletion sdk
Open in desktop
Submodule sdk updated 8 files
+ − lib/linux64/libtier0.so
+ − lib/public/win64/tier0.lib
+2 −1 public/const.h
+2 −0 public/irecipientfilter.h
+1 −1 public/tier0/platform.h
+10 −126 public/tier0/threadtools.h
+1 −1 public/tier1/utlhashtable.h
+2 −0 tier1/keyvalues3.cpp
18 changes: 11 additions & 7 deletions src/leader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ std::map<std::string, ColorPreset> mapColorPresets = {
};
// clang-format on

CUtlVector<ZEPlayerHandle> g_vecLeaders;
std::vector<ZEPlayerHandle> g_vecLeaders;

static int g_iMarkerCount = 0;
static bool g_bPingWithLeader = true;
Expand Down Expand Up @@ -110,14 +110,16 @@ static std::pair<int, std::string> GetLeaders()
{
int iLeaders = 0;
std::string strLeaders = "";
FOR_EACH_VEC_BACK(g_vecLeaders, i)

for (int i = g_vecLeaders.size() - 1; i >= 0; i--)
{
ZEPlayer* pLeader = g_vecLeaders[i].Get();
if (!pLeader)
{
g_vecLeaders.Remove(i);
g_vecLeaders.erase(g_vecLeaders.begin() + i);
continue;
}

CCSPlayerController* pController = CCSPlayerController::FromSlot((CPlayerSlot)pLeader->GetPlayerSlot());
if (!pController)
continue;
Expand Down Expand Up @@ -224,7 +226,7 @@ static bool Leader_SetNewLeader(ZEPlayer* zpLeader, std::string strColor = "")
Leader_ApplyLeaderVisuals(pawnLeader);

zpLeader->PurgeLeaderVotes();
g_vecLeaders.AddToTail(zpLeader->GetHandle());
g_vecLeaders.push_back(zpLeader->GetHandle());
return true;
}

Expand Down Expand Up @@ -299,11 +301,12 @@ static void RemoveLeader(CCSPlayerController* ccsLeader)
zpLeader->SetTracerColor(Color(0, 0, 0, 0));
zpLeader->SetBeaconColor(Color(0, 0, 0, 0));
zpLeader->SetGlowColor(Color(0, 0, 0, 0));
FOR_EACH_VEC_BACK(g_vecLeaders, i)

for (int i = g_vecLeaders.size() - 1; i >= 0; i--)
{
if (g_vecLeaders[i] == zpLeader)
{
g_vecLeaders.Remove(i);
g_vecLeaders.erase(g_vecLeaders.begin() + i);
break;
}
}
Expand Down Expand Up @@ -367,7 +370,8 @@ void Leader_PostEventAbstract_Source1LegacyGameEvent(const uint64* clients, cons
return;

bool bNoHumanLeaders = true;
FOR_EACH_VEC_BACK(g_vecLeaders, i)

for (int i = 0; i < g_vecLeaders.size(); i++)
{
if (g_vecLeaders[i].IsValid())
{
Expand Down
2 changes: 1 addition & 1 deletion src/leader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "playermanager.h"
#include "utils/entity.h"

extern CUtlVector<ZEPlayerHandle> g_vecLeaders;
extern std::vector<ZEPlayerHandle> g_vecLeaders;
extern CConVar<bool> g_cvarEnableLeader;
extern CConVar<bool> g_cvarLeaderActionsHumanOnly;
extern CConVar<CUtlString> g_cvarMarkParticlePath;
Expand Down
1 change: 1 addition & 0 deletions src/recipientfilters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class CRecipientFilter : public IRecipientFilter
NetChannelBufType_t GetNetworkBufType(void) const override { return m_nBufType; }
bool IsInitMessage(void) const override { return m_bInitMessage; }
const CPlayerBitVec& GetRecipients(void) const override { return m_Recipients; }
CPlayerSlot GetPredictedPlayerSlot(void) const override { return -1; }

void AddAllPlayers(void)
{
Expand Down