Skip to content
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

Async support #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Async support #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions GTAScriptHook/InternalCalls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int ExecuteBuffer(BYTE *sbuf, DWORD *lvars, DWORD buflen, int gameVersion)
gst.bStartNewScript = 1;
gst.dwBaseIP = (DWORD) sbuf;
gst.dwScriptIP = (DWORD) sbuf;
gst.strName[0] = 'n';
gst.strName[0] = 'n'; // TODO: Take a look at this
gst.strName[1] = 'e';
gst.strName[2] = 't';
gst.strName[3] = '\0';
Expand Down Expand Up @@ -180,7 +180,7 @@ namespace GTA {
cxt.Push<float>(vec->pZ);
}
}

IntPtr idptr = Runtime::InteropServices::Marshal::StringToHGlobalAnsi(identifier);
NativeInvoke::Invoke(&cxt, (char*)idptr.ToPointer());
Runtime::InteropServices::Marshal::FreeHGlobal(idptr);
Expand Down Expand Up @@ -324,7 +324,7 @@ namespace GTA {
return ((VarPointer^)parameters[pi]._preVal)->Value;
/*} else {
pi = parameters->Length;

for (; (pi - parameters->Length) < ptrCount; pi++) {
parameters[pi]->Value;
}
Expand All @@ -343,7 +343,7 @@ namespace GTA {

memset(&ScriptBuf, 0, sizeof(ScriptBuf));
memcpy(&ScriptBuf, &scmid, 2);

int buf_pos = 2;
int var_id = 0;
DWORD LocalVars[32];
Expand Down Expand Up @@ -375,11 +375,11 @@ namespace GTA {

/*String^ output = "Script buffer: ";

for (int i = 0; i < buf_pos; i++) {
output += ScriptBuf[i].ToString("X2") + " ";
}
for (int i = 0; i < buf_pos; i++) {
output += ScriptBuf[i].ToString("X2") + " ";
}

Log::Debug(output);*/
Log::Debug(output);*/

int result = ExecuteBuffer(ScriptBuf, LocalVars, buf_pos, GameVersion::VersionNumber);

Expand Down