aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcat_or_not <41955154+catornot@users.noreply.github.com>2024-03-13 21:07:09 -0400
committercat_or_not <41955154+catornot@users.noreply.github.com>2024-03-13 21:07:09 -0400
commitbb636e7c489325de27fbd347c82b19f9219c4d40 (patch)
tree473ef6129ff953bc1a49c0b28d6292c8296c052e
parent19599b6c39a55d2fac10497be91af3bf4e332038 (diff)
downloadNorthstarLauncher-bb636e7c489325de27fbd347c82b19f9219c4d40.tar.gz
NorthstarLauncher-bb636e7c489325de27fbd347c82b19f9219c4d40.zip
bring back some things I removed I accidently
-rw-r--r--primedev/server/serverpresence.cpp4
-rw-r--r--primedev/shared/exploit_fixes/exploitfixes.cpp5
2 files changed, 6 insertions, 3 deletions
diff --git a/primedev/server/serverpresence.cpp b/primedev/server/serverpresence.cpp
index 706cd70a..5015aba5 100644
--- a/primedev/server/serverpresence.cpp
+++ b/primedev/server/serverpresence.cpp
@@ -89,11 +89,15 @@ void ServerPresenceManager::CreateConVars()
});
Cvar_ns_server_desc = new ConVar("ns_server_desc", "Default server description", FCVAR_GAMEDLL | FCVAR_REPLICATED, "This server's description", false, 0, false, 0, [](ConVar* cvar, const char* pOldValue, float flOldValue) {
+ NOTE_UNUSED(cvar);
+ NOTE_UNUSED(pOldValue);
+ NOTE_UNUSED(flOldValue);
g_pServerPresence->SetDescription(UnescapeUnicode(g_pServerPresence->Cvar_ns_server_desc->GetString()));
});
Cvar_ns_server_password = new ConVar("ns_server_password", "", FCVAR_GAMEDLL, "This server's password", false, 0, false, 0, [](ConVar* cvar, const char* pOldValue, float flOldValue) {
NOTE_UNUSED(cvar);
+ NOTE_UNUSED(cvar);
NOTE_UNUSED(pOldValue);
NOTE_UNUSED(flOldValue);
g_pServerPresence->SetPassword(g_pServerPresence->Cvar_ns_server_password->GetString());
diff --git a/primedev/shared/exploit_fixes/exploitfixes.cpp b/primedev/shared/exploit_fixes/exploitfixes.cpp
index 1b3069f5..b71b9158 100644
--- a/primedev/shared/exploit_fixes/exploitfixes.cpp
+++ b/primedev/shared/exploit_fixes/exploitfixes.cpp
@@ -135,9 +135,8 @@ bool, __fastcall, (void* pMsg)) // 48 8B D1 48 8B 49 18 48 8B 01 48 FF 60 10
if (!pVar->IsFlagSet(FCVAR_REPLICATED))
{
- spdlog::warn(
- "Blocking replication of remote cvar {} from server (server's var has flag REPLICATED, while ours does not)",
- entry->name);
+ return BLOCKED_INFO(
+ "Invalid flags (" << std::hex << "0x" << pVar->m_ConCommandBase.m_nFlags << "), var is " << entry->name);
// don't block, as non-malicious servers might send bad cvars, and we still want those clients to be able to
// connect