Skip to content

Fix ExecuteScriptEnhanced #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CromFr merged 2 commits into from
May 15, 2026
Merged

Fix ExecuteScriptEnhanced #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
620ca71
Fix ExecuteScriptEnhanced
Septirage Aug 23, 2025
a244c01
Merge branch 'nwn2dev:main' into fix/ImbricatedExecuteScript
Septirage Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/hook/scriptManagement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ constexpr uint32_t NWN2_OFFSET_CleanParam = 0x006b5cd0;
struct NWN2ParamsList {
struct NWN2Param* list;
size_t size;
size_t maxSize;
};
static_assert(sizeof(NWN2ParamsList) == 8);
static_assert(sizeof(NWN2ParamsList) == 0xC);

static struct NWN2ParamsList* nwn2_scriptparams = (struct NWN2ParamsList*)(0x0086F15C);
// static size_t scriptparams_count = 0;
Expand Down Expand Up @@ -90,6 +91,15 @@ int* GetPtrToCNWSMessage()
return (int*)(ptr + 0x10020);
}

__declspec(naked) void __fastcall CleanHeapParams(__in void* heapParamPtr, __in void* Unused)
{
__asm
{
mov edx, NWN2_OFFSET_CleanParam;
jmp edx;
}
}

void ApplyScriptCNWSMessage()
{
int* ptrToCNWSMessage = GetPtrToCNWSMessage();
Expand Down Expand Up @@ -189,8 +199,18 @@ int32_t ExecuteScriptEnhanced(const char* sScriptName,

NWN2ParamsList save = *nwn2_scriptparams;

nwn2_scriptparams->list = scriptparams.data();
nwn2_scriptparams->size = scriptparams.size();
// Prepare a heapMemory container. So Script Function can work inside this ExecuteEnhancedScript
NWN2_HeapMgr* pHeapMgr = NWN2_HeapMgr::Instance();
NWN2_Heap* pHeap = pHeapMgr->GetDefaultHeap();
size_t total_size = scriptparams.size() * sizeof(NWN2Param) + sizeof(int32_t);
uint32_t* parametersHeap = (uint32_t*)pHeap->Allocate(total_size);
parametersHeap[0] = 0; // Avoid to delete inner parameters.

std::memcpy(parametersHeap + 1, scriptparams.data(), scriptparams.size() * sizeof(NWN2Param));

nwn2_scriptparams->list = reinterpret_cast<NWN2Param*>(parametersHeap + 1);
nwn2_scriptparams->size = scriptparams.size();
nwn2_scriptparams->maxSize = scriptparams.size();

// call the script
int retValue
Expand All @@ -205,6 +225,9 @@ int32_t ExecuteScriptEnhanced(const char* sScriptName,
else
retValue = -1;

// As we want to restore saved scriptParameters, we always "clean" what happened here.
CleanHeapParams((void*)nwn2_scriptparams, NULL);

*nwn2_scriptparams = save;

if (bReplaceCNWSMsg)
Expand Down
Loading