aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobTheBob9 <for.oliver.kirkham@gmail.com>2022-10-08 18:30:44 +0100
committerBobTheBob9 <for.oliver.kirkham@gmail.com>2022-10-08 18:30:44 +0100
commit708bfedf71413bb2061a76c3ee4de5cbc8c56513 (patch)
tree5054affd752d1db410bc8b13219dd15bc8201c1b
parentda3d91228c08ec660564368f992a2ba6b78ca4a8 (diff)
downloadNorthstarLauncher-1.9.8-rc2.tar.gz
NorthstarLauncher-1.9.8-rc2.zip
avoid ptr decay when setting auth tokenv1.9.8-rc2
-rw-r--r--NorthstarDLL/r2server.h8
-rw-r--r--NorthstarDLL/scriptserverbrowser.cpp2
2 files changed, 7 insertions, 3 deletions
diff --git a/NorthstarDLL/r2server.h b/NorthstarDLL/r2server.h
index 58b39a05..1abe822d 100644
--- a/NorthstarDLL/r2server.h
+++ b/NorthstarDLL/r2server.h
@@ -10,8 +10,12 @@ namespace R2
#pragma pack(push, 1)
struct CBasePlayer
{
- char pad[88];
- int m_nPlayerIndex;
+ char pad[0x58];
+ uint32_t m_nPlayerIndex;
+
+ // +0x5C
+ char pad1[0x1C75];
+ char m_communityClanTag[16];
};
#pragma pack(pop)
diff --git a/NorthstarDLL/scriptserverbrowser.cpp b/NorthstarDLL/scriptserverbrowser.cpp
index e33406fc..5b2cf75f 100644
--- a/NorthstarDLL/scriptserverbrowser.cpp
+++ b/NorthstarDLL/scriptserverbrowser.cpp
@@ -367,7 +367,7 @@ SQRESULT SQ_ConnectToAuthedServer(HSquirrelVM* sqvm)
return SQRESULT_ERROR;
}
- RemoteServerConnectionInfo info = g_pMasterServerManager->m_pendingConnectionInfo;
+ RemoteServerConnectionInfo& info = g_pMasterServerManager->m_pendingConnectionInfo;
// set auth token, then try to connect
// i'm honestly not entirely sure how silentconnect works regarding ports and encryption so using connect for now