From 3311c99917a73d55ac0390d4f8bc944c21c32df9 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 19 Sep 2022 01:18:14 +0200
Subject: [PATCH] SQVM: use const qualifiers for SQCONTEXT

---
 r5dev/squirrel/sqscript.cpp | 11 +++++------
 r5dev/squirrel/sqscript.h   |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/r5dev/squirrel/sqscript.cpp b/r5dev/squirrel/sqscript.cpp
index 5a306853..95be0ee8 100644
--- a/r5dev/squirrel/sqscript.cpp
+++ b/r5dev/squirrel/sqscript.cpp
@@ -203,7 +203,7 @@ SQBool Script_CreateUIVM()
 // Input  : context - 
 // Output : SQVM* 
 //---------------------------------------------------------------------------------
-CSquirrelVM* Script_GetContextObject(SQCONTEXT context)
+CSquirrelVM* Script_GetContextObject(const SQCONTEXT context)
 {
 	switch (context)
 	{
@@ -258,7 +258,7 @@ SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* szScriptPath, const SQChar
 // Input  : *code - 
 //			context - 
 //---------------------------------------------------------------------------------
-void Script_Execute(const SQChar* code, SQCONTEXT context)
+void Script_Execute(const SQChar* code, const SQCONTEXT context)
 {
 	if (!ThreadInMainThread())
 	{
@@ -274,7 +274,7 @@ void Script_Execute(const SQChar* code, SQCONTEXT context)
 	CSquirrelVM* script = Script_GetContextObject(context);
 	if (!script)
 	{
-		Error(eDLL_T::ENGINE, NO_ERROR, "Attempted to run %s script with no handle to script context\n", SQVM_GetContextName(context));
+		Error(eDLL_T::ENGINE, NO_ERROR, "Attempted to run %s script with no handle to VM\n", SQVM_GetContextName(context));
 		return;
 	}
 
@@ -285,11 +285,10 @@ void Script_Execute(const SQChar* code, SQCONTEXT context)
 		return;
 	}
 
-	SQRESULT compileResult{};
 	SQBufState bufState = SQBufState(code);
+	SQRESULT compileResult = sq_compilebuffer(v, &bufState, "console", -1);
 
-	compileResult = sq_compilebuffer(v, &bufState, "console", -1);
-	if (compileResult >= 0)
+	if (compileResult >= NULL)
 	{
 		sq_pushroottable(v);
 		SQRESULT callResult = sq_call(v, 1, false, false);
diff --git a/r5dev/squirrel/sqscript.h b/r5dev/squirrel/sqscript.h
index 03a65e78..1d09d352 100644
--- a/r5dev/squirrel/sqscript.h
+++ b/r5dev/squirrel/sqscript.h
@@ -114,12 +114,12 @@ SQBool Script_CreateServerVM();
 SQBool Script_CreateClientVM(CHLClient* hlclient);
 #endif // !DEDICATED
 SQBool Script_CreateUIVM();
-CSquirrelVM* Script_GetContextObject(SQCONTEXT context);
+CSquirrelVM* Script_GetContextObject(const SQCONTEXT context);
 
 SQInteger Script_LoadRson(const SQChar* szRsonName);
 SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* szScriptPath, const SQChar* szScriptName, SQInteger nFlag);
 
-void Script_Execute(const SQChar* code, SQCONTEXT context);
+void Script_Execute(const SQChar* code, const SQCONTEXT context);
 
 void SQScript_Attach();
 void SQScript_Detach();