diff --git a/sfall/HookScripts.cpp b/sfall/HookScripts.cpp index 02945a9e..8bd7134c 100644 --- a/sfall/HookScripts.cpp +++ b/sfall/HookScripts.cpp @@ -86,7 +86,7 @@ static void _stdcall RunSpecificHookScript(sHookScript *hook) { if (hook->callback != -1) RunScriptProcByNum(hook->prog.ptr, hook->callback); else - RunScriptProc(&hook->prog, start_proc); + RunScriptProc(&hook->prog, start); } static void _stdcall RunHookScript(DWORD hook) { if (hooks[hook].size()) { diff --git a/sfall/ScriptExtender.cpp b/sfall/ScriptExtender.cpp index 7aa9c3d2..75fbd9dd 100644 --- a/sfall/ScriptExtender.cpp +++ b/sfall/ScriptExtender.cpp @@ -1422,7 +1422,7 @@ void RunScriptProc(sScriptProgram* prog, DWORD procId) { } static void RunScript(sGlobalScript* script) { script->count=0; - RunScriptProc(&script->prog, start_proc); // run "start" + RunScriptProc(&script->prog, start); // run "start" } /** diff --git a/sfall/ScriptExtender.h b/sfall/ScriptExtender.h index c0a95cc4..a9229524 100644 --- a/sfall/ScriptExtender.h +++ b/sfall/ScriptExtender.h @@ -30,7 +30,7 @@ struct sGlobalVar int val; }; -#define SCRIPT_PROC_MAX (27) +#define SCRIPT_PROC_MAX (27) typedef struct { DWORD ptr; @@ -86,12 +86,13 @@ static char reg_anim_combat_check = 1; extern DWORD isGlobalScriptLoading; // types for script variables -#define VAR_TYPE_INT (0xC001) -#define VAR_TYPE_FLOAT (0xA001) -#define VAR_TYPE_STR (0x9801) -#define VAR_TYPE_STR2 (0x9001) +#define VAR_TYPE_INT (0xC001) +#define VAR_TYPE_FLOAT (0xA001) +#define VAR_TYPE_STR (0x9801) +#define VAR_TYPE_STR2 (0x9001) // script procs -#define start_proc (1) -#define map_enter_p_proc (15) -#define map_update_proc (23) +#define start (1) +#define map_enter_p_proc (15) +#define destroy_p_proc (18) +#define map_update_p_proc (23)