aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL/masterserver/masterserver.cpp
diff options
context:
space:
mode:
authorJan <sentrycraft123@gmail.com>2023-06-29 04:22:33 +0100
committerGitHub <noreply@github.com>2023-06-28 23:22:33 -0400
commitefd907105cf7906c78253631f75bf4fd83f769db (patch)
tree0516853204106852adb06ee1d69a74e8994309a0 /NorthstarDLL/masterserver/masterserver.cpp
parentb5c4e4e7ed81394070b05296ed087b6043d27667 (diff)
downloadNorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.tar.gz
NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.zip
* turn implicit type casts into standard compliant explicit type casts * correct includes and library names * correct implicit use of std-namespaced functions * turn incomplete virtual implementations into pure virtuals (this also follows what the Source SDK tier0 header does) * define SqRecurseArgs ahead of implementation to fix templating problems * switch out removed getentity with getthisentity * fix calls to curl_easy_escape with wrong types * replace winapi-specific function with std starts_with function * format squirrel header
Diffstat (limited to 'NorthstarDLL/masterserver/masterserver.cpp')
-rw-r--r--NorthstarDLL/masterserver/masterserver.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/NorthstarDLL/masterserver/masterserver.cpp b/NorthstarDLL/masterserver/masterserver.cpp
index 015670e7..c2bbdfd8 100644
--- a/NorthstarDLL/masterserver/masterserver.cpp
+++ b/NorthstarDLL/masterserver/masterserver.cpp
@@ -1,6 +1,6 @@
#include "masterserver/masterserver.h"
#include "core/convar/concommand.h"
-#include "playlist.h"
+#include "shared/playlist.h"
#include "server/auth/serverauthentication.h"
#include "core/tier0.h"
#include "engine/r2engine.h"
@@ -1197,11 +1197,11 @@ void MasterServerPresenceReporter::InternalAddServer(const ServerPresence* pServ
// format every paramter because computers hate me
{
- char* nameEscaped = curl_easy_escape(curl, threadedPresence.m_sServerName.c_str(), NULL);
- char* descEscaped = curl_easy_escape(curl, threadedPresence.m_sServerDesc.c_str(), NULL);
- char* mapEscaped = curl_easy_escape(curl, threadedPresence.m_MapName, NULL);
- char* playlistEscaped = curl_easy_escape(curl, threadedPresence.m_PlaylistName, NULL);
- char* passwordEscaped = curl_easy_escape(curl, threadedPresence.m_Password, NULL);
+ char* nameEscaped = curl_easy_escape(curl, threadedPresence.m_sServerName.c_str(), 0);
+ char* descEscaped = curl_easy_escape(curl, threadedPresence.m_sServerDesc.c_str(), 0);
+ char* mapEscaped = curl_easy_escape(curl, threadedPresence.m_MapName, 0);
+ char* playlistEscaped = curl_easy_escape(curl, threadedPresence.m_PlaylistName, 0);
+ char* passwordEscaped = curl_easy_escape(curl, threadedPresence.m_Password, 0);
curl_easy_setopt(
curl,
@@ -1344,11 +1344,11 @@ void MasterServerPresenceReporter::InternalUpdateServer(const ServerPresence* pS
// send all registration info so we have all necessary info to reregister our server if masterserver goes down,
// without a restart this isn't threadsafe :terror:
{
- char* nameEscaped = curl_easy_escape(curl, threadedPresence.m_sServerName.c_str(), NULL);
- char* descEscaped = curl_easy_escape(curl, threadedPresence.m_sServerDesc.c_str(), NULL);
- char* mapEscaped = curl_easy_escape(curl, threadedPresence.m_MapName, NULL);
- char* playlistEscaped = curl_easy_escape(curl, threadedPresence.m_PlaylistName, NULL);
- char* passwordEscaped = curl_easy_escape(curl, threadedPresence.m_Password, NULL);
+ char* nameEscaped = curl_easy_escape(curl, threadedPresence.m_sServerName.c_str(), 0);
+ char* descEscaped = curl_easy_escape(curl, threadedPresence.m_sServerDesc.c_str(), 0);
+ char* mapEscaped = curl_easy_escape(curl, threadedPresence.m_MapName, 0);
+ char* playlistEscaped = curl_easy_escape(curl, threadedPresence.m_PlaylistName, 0);
+ char* passwordEscaped = curl_easy_escape(curl, threadedPresence.m_Password, 0);
curl_easy_setopt(
curl,