Format

Author: Septirage

include/nwnx_cplugin.h

@@ -31,7 +31,10 @@ struct NWNXCPlugin_InitInfo {
 ///   has been successfully executed.
 /// @param bReplaceCNWSMsg If true, the CNWSMessage will be switched for this call
 ///   avoiding issues if used during message construction
-typedef void(ExecuteScriptFn)(const char* sScript, uint32_t oTarget, bool* outExecuted, bool bReplaceCNWSMsg);
+typedef void(ExecuteScriptFn)(const char* sScript,
+                              uint32_t oTarget,
+                              bool* outExecuted,
+                              bool bReplaceCNWSMsg);
 /// Bound to NWScript ExecuteScriptEnhanced function
 /// @param outExecuted If not null, the bool will be set to true if the script
 ///   has been successfully executed. This is used to differenciate between a

src/hook/scriptManagement.cpp

@@ -5,8 +5,8 @@
 #include <cstring>
 #include <string>
 
-#include "nwn2heap.h"
 #include "../misc/log.h"
+#include "nwn2heap.h"
 extern std::unique_ptr<LogNWNX> logger;
 
 constexpr uint32_t NWN_DEFAULT_EXECUTESCRIPT_ENH_PARAMS_LEN = 32;
@@ -85,8 +85,8 @@ static int OriginalCNWSMsgAddr = 0;
 int* GetPtrToCNWSMessage()
 {
 	int ptr = *(int*)OFFS_g_pAppManager;
-	ptr = *(int*)(ptr + 4);
-	ptr = *(int*)(ptr + 4);
+	ptr     = *(int*)(ptr + 4);
+	ptr     = *(int*)(ptr + 4);
 	return (int*)(ptr + 0x10020);
 }
 
@@ -97,14 +97,13 @@ void ApplyScriptCNWSMessage()
 	static unsigned char* scriptCNWSMsg;
 	static bool isInit = false;
 
-	if (!isInit)
-	{
-		OriginalCNWSMsgAddr = *ptrToCNWSMessage;
-		NWN2_HeapMgr *pHeapMgr = NWN2_HeapMgr::Instance();
-		NWN2_Heap *pHeap = pHeapMgr->GetDefaultHeap();
-		scriptCNWSMsg = (unsigned char*)pHeap->Allocate(0x58);
-		unsigned char* Msg1 = (unsigned char*)pHeap->Allocate(0x80);
-		unsigned char* Msg2 = (unsigned char*)pHeap->Allocate(0x80);
+	if (!isInit) {
+		OriginalCNWSMsgAddr    = *ptrToCNWSMessage;
+		NWN2_HeapMgr* pHeapMgr = NWN2_HeapMgr::Instance();
+		NWN2_Heap* pHeap       = pHeapMgr->GetDefaultHeap();
+		scriptCNWSMsg          = (unsigned char*)pHeap->Allocate(0x58);
+		unsigned char* Msg1    = (unsigned char*)pHeap->Allocate(0x80);
+		unsigned char* Msg2    = (unsigned char*)pHeap->Allocate(0x80);
 
 		scriptCNWSMsg[0] = 0xC0;
 		scriptCNWSMsg[1] = 0x42;
@@ -118,44 +117,44 @@ void ApplyScriptCNWSMessage()
 		((uint32_t*)scriptCNWSMsg)[2] = 0x80;
 		((uint32_t*)scriptCNWSMsg)[3] = 0x0;
 
-
 		((uint32_t*)scriptCNWSMsg)[4] = (int)Msg2;
 		((uint32_t*)scriptCNWSMsg)[5] = 0x80;
 		((uint32_t*)scriptCNWSMsg)[6] = 0;
 		((uint32_t*)scriptCNWSMsg)[7] = 0;
 
 		scriptCNWSMsg[0x20] = 0;
 
-
-		((uint32_t*)scriptCNWSMsg)[9] = 0x0;
+		((uint32_t*)scriptCNWSMsg)[9]   = 0x0;
 		((uint32_t*)scriptCNWSMsg)[0xa] = 0x0;
 		((uint32_t*)scriptCNWSMsg)[0xb] = 0x0;
 		((uint32_t*)scriptCNWSMsg)[0xc] = 0x0;
 
-		((uint32_t*)scriptCNWSMsg)[0xd] = 0x0;
-		((uint32_t*)scriptCNWSMsg)[0xe] = 0x0;
-		((uint32_t*)scriptCNWSMsg)[0xf] = 0x0;
+		((uint32_t*)scriptCNWSMsg)[0xd]  = 0x0;
+		((uint32_t*)scriptCNWSMsg)[0xe]  = 0x0;
+		((uint32_t*)scriptCNWSMsg)[0xf]  = 0x0;
 		((uint32_t*)scriptCNWSMsg)[0x10] = 0x0;
-		scriptCNWSMsg[0x44] = 0x0;
-		scriptCNWSMsg[0x45] = 0x0;
-		isInit = true;
+		scriptCNWSMsg[0x44]              = 0x0;
+		scriptCNWSMsg[0x45]              = 0x0;
+		isInit                           = true;
 	}
 
-	if(scriptCNWSMsg != NULL)
+	if (scriptCNWSMsg != NULL)
 		*ptrToCNWSMessage = (int)(scriptCNWSMsg);
 }
 
 void RestoreOriginalCNWSMessage()
 {
-	//Be sure to not restore before saving the Original CNWSMsg
-	if(OriginalCNWSMsgAddr != 0)
-	{
+	// Be sure to not restore before saving the Original CNWSMsg
+	if (OriginalCNWSMsgAddr != 0) {
 		int* ptrToCNWSMessage = GetPtrToCNWSMessage();
-		*ptrToCNWSMessage = OriginalCNWSMsgAddr;
+		*ptrToCNWSMessage     = OriginalCNWSMsgAddr;
 	}
 }
 
-void ExecuteScript(const char* sScript, NWN::OBJECTID oTarget, bool* outExecuted, bool bReplaceCNWSMsg)
+void ExecuteScript(const char* sScript,
+                   NWN::OBJECTID oTarget,
+                   bool* outExecuted,
+                   bool bReplaceCNWSMsg)
 {
 	logger->Trace("ExecuteScript %s, %lu", sScript, oTarget);
 

src/hook/scriptManagement.h

@@ -10,11 +10,14 @@
 namespace NWScript {
 
 extern "C" {
-void ExecuteScript(const char* sScript, NWN::OBJECTID oTarget, bool* outExecuted = NULL, bool bReplaceCNWSMsg = false);
+void ExecuteScript(const char* sScript,
+                   NWN::OBJECTID oTarget,
+                   bool* outExecuted    = NULL,
+                   bool bReplaceCNWSMsg = false);
 int32_t ExecuteScriptEnhanced(const char* sScriptName,
                               NWN::OBJECTID oTarget,
                               bool bClearParams,
-                              bool* outExecuted = NULL,
+                              bool* outExecuted    = NULL,
                               bool bReplaceCNWSMsg = false);
 void AddScriptParameterInt(int32_t nParam);
 void AddScriptParameterString(const char* sParam);

src/plugins/xp_example_cplugin/cplugin_example.cpp

@@ -129,8 +129,8 @@ NWNXCPlugin_GetInt(void* cplugin, const char* sFunction, const char* sParam1, in
 	} else if (function == "TEST_EXECUTESCRIPTENHBAD") {
 		constexpr uint32_t OBJID_MODULE = 0;
 		bool executed                   = true;
-		auto res
-		    = plugin->hooks.ExecuteScriptEnhanced("euqsgdihohcqsc", OBJID_MODULE, true, &executed, false);
+		auto res = plugin->hooks.ExecuteScriptEnhanced("euqsgdihohcqsc", OBJID_MODULE, true,
+		                                               &executed, false);
 		if (executed)
 			res -= 1000;
 		return res;