almost fully replaced hooking lib

1 files changed, 65 insertions, 65 deletions

diff --git a/NorthstarDLL/miscserverscript.cpp b/NorthstarDLL/miscserverscript.cpp
index 488e071a..32fd8a84 100644
--- a/NorthstarDLL/miscserverscript.cpp
+++ b/NorthstarDLL/miscserverscript.cpp
@@ -1,66 +1,66 @@
-#include "pch.h"
-#include "miscserverscript.h"
-#include "squirrel.h"
-#include "masterserver.h"
-#include "serverauthentication.h"
-#include "r2client.h"
-
-// annoying helper function because i can't figure out getting players or entities from sqvm rn
-// wish i didn't have to do it like this, but here we are
-void* GetPlayerByIndex(int playerIndex)
-{
-	const int PLAYER_ARRAY_OFFSET = 0x12A53F90;
-	const int PLAYER_SIZE = 0x2D728;
-
-	void* playerArrayBase = (char*)GetModuleHandleA("engine.dll") + PLAYER_ARRAY_OFFSET;
-	void* player = (char*)playerArrayBase + (playerIndex * PLAYER_SIZE);
-
-	return player;
-}
-
-// void function NSEarlyWritePlayerIndexPersistenceForLeave( int playerIndex )
-SQRESULT SQ_EarlyWritePlayerIndexPersistenceForLeave(void* sqvm)
-{
-	int playerIndex = g_pServerSquirrel->getinteger(sqvm, 1);
-	void* player = GetPlayerByIndex(playerIndex);
-
-	if (!g_ServerAuthenticationManager->m_additionalPlayerData.count(player))
-	{
-		g_pServerSquirrel->raiseerror(sqvm, fmt::format("Invalid playerindex {}", playerIndex).c_str());
-		return SQRESULT_ERROR;
-	}
-
-	g_ServerAuthenticationManager->m_additionalPlayerData[player].needPersistenceWriteOnLeave = false;
-	g_ServerAuthenticationManager->WritePersistentData(player);
-	return SQRESULT_NULL;
-}
-
-// bool function NSIsWritingPlayerPersistence()
-SQRESULT SQ_IsWritingPlayerPersistence(void* sqvm)
-{
-	g_pServerSquirrel->pushbool(sqvm, g_MasterServerManager->m_bSavingPersistentData);
-	return SQRESULT_NOTNULL;
-}
-
-// bool function NSIsPlayerIndexLocalPlayer( int playerIndex )
-SQRESULT SQ_IsPlayerIndexLocalPlayer(void* sqvm)
-{
-	int playerIndex = g_pServerSquirrel->getinteger(sqvm, 1);
-	void* player = GetPlayerByIndex(playerIndex);
-	if (!g_ServerAuthenticationManager->m_additionalPlayerData.count(player))
-	{
-		g_pServerSquirrel->raiseerror(sqvm, fmt::format("Invalid playerindex {}", playerIndex).c_str());
-		return SQRESULT_ERROR;
-	}
-
-	g_pServerSquirrel->pushbool(sqvm, !strcmp(R2::g_pLocalPlayerUserID, (char*)player + 0xF500));
-	return SQRESULT_NOTNULL;
-}
-
-ON_DLL_LOAD_RELIESON("server.dll", MiscServerScriptCommands, ServerSquirrel, [](HMODULE baseAddress)
-{
-	g_pServerSquirrel->AddFuncRegistration(
-		"void", "NSEarlyWritePlayerIndexPersistenceForLeave", "int playerIndex", "", SQ_EarlyWritePlayerIndexPersistenceForLeave);
-	g_pServerSquirrel->AddFuncRegistration("bool", "NSIsWritingPlayerPersistence", "", "", SQ_IsWritingPlayerPersistence);
-	g_pServerSquirrel->AddFuncRegistration("bool", "NSIsPlayerIndexLocalPlayer", "int playerIndex", "", SQ_IsPlayerIndexLocalPlayer);
+#include "pch.h"

+#include "miscserverscript.h"

+#include "squirrel.h"

+#include "masterserver.h"

+#include "serverauthentication.h"

+#include "r2client.h"

+

+// annoying helper function because i can't figure out getting players or entities from sqvm rn

+// wish i didn't have to do it like this, but here we are

+void* GetPlayerByIndex(int playerIndex)

+{

+	const int PLAYER_ARRAY_OFFSET = 0x12A53F90;

+	const int PLAYER_SIZE = 0x2D728;

+

+	void* playerArrayBase = (char*)GetModuleHandleA("engine.dll") + PLAYER_ARRAY_OFFSET;

+	void* player = (char*)playerArrayBase + (playerIndex * PLAYER_SIZE);

+

+	return player;

+}

+

+// void function NSEarlyWritePlayerIndexPersistenceForLeave( int playerIndex )

+SQRESULT SQ_EarlyWritePlayerIndexPersistenceForLeave(void* sqvm)

+{

+	int playerIndex = g_pServerSquirrel->getinteger(sqvm, 1);

+	void* player = GetPlayerByIndex(playerIndex);

+

+	if (!g_ServerAuthenticationManager->m_additionalPlayerData.count(player))

+	{

+		g_pServerSquirrel->raiseerror(sqvm, fmt::format("Invalid playerindex {}", playerIndex).c_str());

+		return SQRESULT_ERROR;

+	}

+

+	g_ServerAuthenticationManager->m_additionalPlayerData[player].needPersistenceWriteOnLeave = false;

+	g_ServerAuthenticationManager->WritePersistentData(player);

+	return SQRESULT_NULL;

+}

+

+// bool function NSIsWritingPlayerPersistence()

+SQRESULT SQ_IsWritingPlayerPersistence(void* sqvm)

+{

+	g_pServerSquirrel->pushbool(sqvm, g_MasterServerManager->m_bSavingPersistentData);

+	return SQRESULT_NOTNULL;

+}

+

+// bool function NSIsPlayerIndexLocalPlayer( int playerIndex )

+SQRESULT SQ_IsPlayerIndexLocalPlayer(void* sqvm)

+{

+	int playerIndex = g_pServerSquirrel->getinteger(sqvm, 1);

+	void* player = GetPlayerByIndex(playerIndex);

+	if (!g_ServerAuthenticationManager->m_additionalPlayerData.count(player))

+	{

+		g_pServerSquirrel->raiseerror(sqvm, fmt::format("Invalid playerindex {}", playerIndex).c_str());

+		return SQRESULT_ERROR;

+	}

+

+	g_pServerSquirrel->pushbool(sqvm, !strcmp(R2::g_pLocalPlayerUserID, (char*)player + 0xF500));

+	return SQRESULT_NOTNULL;

+}

+

+ON_DLL_LOAD_RELIESON("server.dll", MiscServerScriptCommands, ServerSquirrel, [](HMODULE baseAddress)

+{

+	g_pServerSquirrel->AddFuncRegistration(

+		"void", "NSEarlyWritePlayerIndexPersistenceForLeave", "int playerIndex", "", SQ_EarlyWritePlayerIndexPersistenceForLeave);

+	g_pServerSquirrel->AddFuncRegistration("bool", "NSIsWritingPlayerPersistence", "", "", SQ_IsWritingPlayerPersistence);

+	g_pServerSquirrel->AddFuncRegistration("bool", "NSIsPlayerIndexLocalPlayer", "int playerIndex", "", SQ_IsPlayerIndexLocalPlayer);

 })
\ No newline at end of file