fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replaced data type hex values with proper VAR_TYPE_* defines for code readability.

Browse Source
This commit is contained in:
NovaRain
2017-12-03 23:54:39 +08:00
parent 4fdd1d3cd8
commit fd91be7ea2
10 changed files with 333 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/Scripting/Handlers/Core.cpp
+21 -21
View File
@@ -42,7 +42,7 @@ void __declspec(naked) op_set_global_script_repeat() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push ecx;
@@ -65,7 +65,7 @@ void __declspec(naked) op_set_global_script_type() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push ecx;
@@ -86,7 +86,7 @@ void __declspec(naked) op_available_global_script_types() {
mov edx, availableGlobalScriptTypes;
mov ecx, eax;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -113,11 +113,11 @@ void __declspec(naked) op_set_sfall_global() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jz next;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
push esi;
push eax;
@@ -153,11 +153,11 @@ void __declspec(naked) op_get_sfall_global_int() {
mov esi, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp si, 0x9001;
cmp si, VAR_TYPE_STR2;
jz next;
cmp si, 0x9801;
cmp si, VAR_TYPE_STR;
jz next;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push eax;
call GetGlobalVarInt;
@@ -174,7 +174,7 @@ next:
end:
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call fo::funcoffs::interpretPushShort_;
pop esi;
@@ -199,11 +199,11 @@ void __declspec(naked) op_get_sfall_global_float() {
mov esi, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp si, 0x9001;
cmp si, VAR_TYPE_STR2;
jz next;
cmp si, 0x9801;
cmp si, VAR_TYPE_STR;
jz next;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push eax;
call GetGlobalVarInt;
@@ -220,7 +220,7 @@ next:
end:
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, edi;
call fo::funcoffs::interpretPushShort_;
pop esi;
@@ -242,7 +242,7 @@ void __declspec(naked) op_get_sfall_arg() {
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -269,7 +269,7 @@ void __declspec(naked) op_get_sfall_args() {
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -290,9 +290,9 @@ void __declspec(naked) op_set_sfall_arg() {
mov esi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push edx;
push eax;
@@ -313,7 +313,7 @@ void __declspec(naked) op_set_sfall_return() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call SetHSReturn;
@@ -333,7 +333,7 @@ void __declspec(naked) op_init_hook() {
mov edx, initingHookScripts;
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
pop edx;
pop ecx;
@@ -349,7 +349,7 @@ void __declspec(naked) op_set_self() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
push eax;
push ebp;
sfall/Modules/Scripting/Handlers/FileSystem.cpp
+42 -42
View File
@@ -41,12 +41,12 @@ void __declspec(naked) op_fs_create() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz fail;
next:
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz fail;
mov ebx, eax;
mov eax, edi;
@@ -63,7 +63,7 @@ end:
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov eax, edi;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -84,14 +84,14 @@ void __declspec(naked) op_fs_copy() {
mov esi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0x9001;
cmp di, VAR_TYPE_STR2;
jz next;
cmp di, 0x9801;
cmp di, VAR_TYPE_STR;
jnz fail;
next:
cmp si, 0x9001;
cmp si, VAR_TYPE_STR2;
jz next2;
cmp si, 0x9801;
cmp si, VAR_TYPE_STR;
jnz fail;
next2:
mov ebx, eax;
@@ -114,7 +114,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -129,9 +129,9 @@ void __declspec(naked) op_fs_find() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0x9001;
cmp di, VAR_TYPE_STR2;
jz next;
cmp di, 0x9801;
cmp di, VAR_TYPE_STR;
jnz fail;
next:
mov ebx, eax;
@@ -149,7 +149,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -170,9 +170,9 @@ void __declspec(naked) op_fs_write_byte() {
mov esi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push ecx;
push eax;
@@ -197,9 +197,9 @@ void __declspec(naked) op_fs_write_short() {
mov esi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push ecx;
push eax;
@@ -224,11 +224,11 @@ void __declspec(naked) op_fs_write_int() {
mov esi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jz next;
cmp si, 0xa001;
cmp si, VAR_TYPE_FLOAT;
jnz end;
next:
push ecx;
@@ -255,12 +255,12 @@ void __declspec(naked) op_fs_write_string() {
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ebp, eax;
cmp bx, 0x9001;
cmp bx, VAR_TYPE_STR2;
jz next;
cmp bx, 0x9801;
cmp bx, VAR_TYPE_STR;
jnz end;
next:
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
mov edx, ebx;
mov ebx, esi;
@@ -290,12 +290,12 @@ void __declspec(naked) op_fs_write_bstring() {
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ebp, eax;
cmp bx, 0x9001;
cmp bx, VAR_TYPE_STR2;
jz next;
cmp bx, 0x9801;
cmp bx, VAR_TYPE_STR;
jnz end;
next:
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
mov edx, ebx;
mov ebx, esi;
@@ -318,7 +318,7 @@ void __declspec(naked) op_fs_read_byte() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_byte;
@@ -331,7 +331,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -346,7 +346,7 @@ void __declspec(naked) op_fs_read_short() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_short;
@@ -359,7 +359,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -374,7 +374,7 @@ void __declspec(naked) op_fs_read_int() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_int;
@@ -387,7 +387,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -402,7 +402,7 @@ void __declspec(naked) op_fs_read_float() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_int;
@@ -415,7 +415,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -430,7 +430,7 @@ void __declspec(naked) op_fs_delete() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end
push eax;
call FSdelete;
@@ -448,7 +448,7 @@ void __declspec(naked) op_fs_size() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSsize;
@@ -461,7 +461,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -476,7 +476,7 @@ void __declspec(naked) op_fs_pos() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSpos;
@@ -489,7 +489,7 @@ end:
mov eax, ebp;
call fo::funcoffs::interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
popad;
retn;
@@ -510,9 +510,9 @@ void __declspec(naked) op_fs_seek() {
mov esi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push ecx;
push eax;
@@ -537,9 +537,9 @@ void __declspec(naked) op_fs_resize() {
mov esi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
push ecx;
push eax;
sfall/Modules/Scripting/Handlers/Graphics.cpp
+32 -32
View File
@@ -42,7 +42,7 @@ void __declspec(naked) op_graphics_funcs_available() {
inc edx;
end:
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -63,9 +63,9 @@ void __declspec(naked) op_load_shader() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz error;
next:
mov ebx, eax;
@@ -80,7 +80,7 @@ error:
result:
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xC001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call fo::funcoffs::interpretPushShort_;
pop edi;
@@ -101,7 +101,7 @@ void __declspec(naked) op_free_shader() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call FreeShader;
@@ -123,7 +123,7 @@ void __declspec(naked) op_activate_shader() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call ActivateShader;
@@ -145,7 +145,7 @@ void __declspec(naked) op_deactivate_shader() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call DeactivateShader;
@@ -177,10 +177,10 @@ void __declspec(naked) op_get_shader_texture() {
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz fail;
mov ebx, [esp + 4];
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz fail;
//set the new value
push ecx;
@@ -196,7 +196,7 @@ end:
//Pass back the result
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -238,14 +238,14 @@ void __declspec(naked) op_set_shader_int() {
call fo::funcoffs::interpretPopLong_;
mov[esp], eax;
//Error check
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz fail;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz fail;
next:
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz fail;
mov eax, ecx;
mov ebx, ebp;
@@ -295,14 +295,14 @@ void __declspec(naked) op_set_shader_texture() {
call fo::funcoffs::interpretPopLong_;
mov[esp], eax;
//Error check
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz fail;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz fail;
next:
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz fail;
mov eax, ecx;
mov ebx, ebp;
@@ -352,19 +352,19 @@ void __declspec(naked) op_set_shader_float() {
call fo::funcoffs::interpretPopLong_;
mov[esp], eax;
//Error check
cmp di, 0xa001;
cmp di, VAR_TYPE_FLOAT;
jz paramWasFloat;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
fild[esp + 8];
fstp[esp + 8];
paramWasFloat:
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz fail;
next:
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz fail;
mov eax, ecx;
mov ebx, ebp;
@@ -406,20 +406,20 @@ argloopstart:
//Error check
mov ecx, 4;
checkloopstart:
cmp word ptr[esp + ecx * 2 + 0x1a], 0xa001;
cmp word ptr[esp + ecx * 2 + 0x1a], VAR_TYPE_FLOAT;
jz paramWasFloat;
cmp word ptr[esp + ecx * 2 + 0x1a], 0xc001;
cmp word ptr[esp + ecx * 2 + 0x1a], VAR_TYPE_INT;
jnz fail;
fild[esp + ecx * 4 + 0x4];
fstp[esp + ecx * 4 + 0x4];
paramWasFloat:
loop checkloopstart;
cmp word ptr[esp + 0x1a], 0x9001;
cmp word ptr[esp + 0x1a], VAR_TYPE_STR2;
jz next;
cmp word ptr[esp + 0x1a], 0x9801;
cmp word ptr[esp + 0x1a], VAR_TYPE_STR;
jnz fail;
next:
cmp word ptr[esp + 0x18], 0xc001;
cmp word ptr[esp + 0x18], VAR_TYPE_INT;
jnz fail;
mov eax, ebp;
mov ebx, [esp + 4];
@@ -452,7 +452,7 @@ void __declspec(naked) op_get_shader_version() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call fo::funcoffs::interpretPushShort_;
pop edi;
@@ -480,9 +480,9 @@ void __declspec(naked) op_set_shader_mode() {
mov esi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz fail;
push eax;
call SetShaderMode;
@@ -508,7 +508,7 @@ void __declspec(naked) op_force_graphics_refresh() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call ForceGraphicsRefresh;
sfall/Modules/Scripting/Handlers/Interface.cpp
+18 -18
View File
@@ -38,7 +38,7 @@ void __declspec(naked) op_input_funcs_available() {
mov ecx, eax;
mov edx, 1; //They're always available from 2.9 on
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -64,7 +64,7 @@ void __declspec(naked) op_tap_key() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
test eax, eax;
jl end;
@@ -89,7 +89,7 @@ void __declspec(naked) op_get_mouse_x() {
add edx, ds:[FO_VAR_mouse_hotx];
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_
pop edx;
pop ecx;
@@ -106,7 +106,7 @@ void __declspec(naked) op_get_mouse_y() {
add edx, ds:[FO_VAR_mouse_hoty];
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_
pop edx;
pop ecx;
@@ -122,7 +122,7 @@ void __declspec(naked) op_get_mouse_buttons() {
mov edx, ds:[FO_VAR_last_buttons];
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_
pop edx;
pop ecx;
@@ -138,7 +138,7 @@ void __declspec(naked) op_get_window_under_mouse() {
mov edx, ds:[FO_VAR_last_button_winID];
call fo::funcoffs::interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_
pop edx;
pop ecx;
@@ -155,7 +155,7 @@ void __declspec(naked) op_get_screen_width() {
inc edx
call fo::funcoffs::interpretPushLong_
pop eax
mov edx, 0xc001
mov edx, VAR_TYPE_INT
call fo::funcoffs::interpretPushShort_
pop edx
retn
@@ -171,7 +171,7 @@ void __declspec(naked) op_get_screen_height() {
inc edx
call fo::funcoffs::interpretPushLong_
pop eax
mov edx, 0xc001
mov edx, VAR_TYPE_INT
call fo::funcoffs::interpretPushShort_
pop edx
retn
@@ -204,9 +204,9 @@ void __declspec(naked) op_create_message_window() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz end;
next:
mov ebx, eax;
@@ -242,7 +242,7 @@ void __declspec(naked) op_get_viewport_x() {
mov ecx, eax;
mov edx, ds:[FO_VAR_wmWorldOffsetX];
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -260,7 +260,7 @@ void __declspec(naked) op_get_viewport_y() {
mov ecx, eax;
mov edx, ds:[FO_VAR_wmWorldOffsetY];
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -280,7 +280,7 @@ void __declspec(naked) op_set_viewport_x() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
mov ds:[FO_VAR_wmWorldOffsetX], eax
end:
@@ -301,7 +301,7 @@ void __declspec(naked) op_set_viewport_y() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
mov ds:[FO_VAR_wmWorldOffsetY], eax
end:
@@ -320,7 +320,7 @@ void __declspec(naked) op_show_iface_tag() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp eax, 3;
je falloutfunc;
@@ -346,7 +346,7 @@ void __declspec(naked) op_hide_iface_tag() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp eax, 3;
je falloutfunc;
@@ -373,7 +373,7 @@ void __declspec(naked) op_is_iface_tag_active() {
mov edx, eax;
mov eax, ebx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
cmp eax, 3;
je falloutfunc;
@@ -404,7 +404,7 @@ end:
mov eax, ebx;
call fo::funcoffs::interpretPushLong_;
mov eax, ebx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
add esp, 4;
popad;
sfall/Modules/Scripting/Handlers/Memory.cpp
+19 -19
View File
@@ -37,7 +37,7 @@ void __declspec(naked) op_read_byte() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
movzx edx, byte ptr ds : [eax];
jmp result;
@@ -46,7 +46,7 @@ error:
result:
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -66,7 +66,7 @@ void __declspec(naked) op_read_short() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
movzx edx, word ptr ds : [eax];
jmp result;
@@ -75,7 +75,7 @@ error:
result:
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -95,7 +95,7 @@ void __declspec(naked) op_read_int() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
mov edx, dword ptr ds : [eax];
jmp result;
@@ -104,7 +104,7 @@ error:
result:
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -124,7 +124,7 @@ void __declspec(naked) op_read_string() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
mov edx, eax;
jmp result;
@@ -133,7 +133,7 @@ error:
result:
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0x9801;
mov edx, VAR_TYPE_STR;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -157,9 +157,9 @@ void __declspec(naked) op_write_byte() {
mov edi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
//mov byte ptr ds:[eax], dl;
and edx, 0xff;
@@ -186,9 +186,9 @@ void __declspec(naked) op_write_short() {
mov edi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
//mov word ptr ds:[eax], dx;
and edx, 0xffff;
@@ -215,9 +215,9 @@ void __declspec(naked) op_write_int() {
mov edi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
//mov dword ptr ds:[eax], edx;
push edx;
@@ -255,11 +255,11 @@ void __declspec(naked) op_write_string() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0x9001;
cmp si, VAR_TYPE_STR2;
jz next;
cmp si, 0x9801;
cmp si, VAR_TYPE_STR;
jnz end;
next:
mov ebx, edi;
@@ -287,7 +287,7 @@ static void _stdcall CallOffsetInternal(DWORD func, DWORD script) {
__asm {
mov eax, script;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
jz legal;
inc illegalarg;
legal:
@@ -318,7 +318,7 @@ legal:
mov edx, args[0];
call fo::funcoffs::interpretPushLong_;
mov eax, script;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
}
}
sfall/Modules/Scripting/Handlers/Misc.cpp
+83 -83
View File
File diff suppressed because it is too large Load Diff
sfall/Modules/Scripting/Handlers/Objects.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ void __declspec(naked) op_remove_script() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
test eax, eax;
jz end;
@@ -72,9 +72,9 @@ void __declspec(naked) op_set_script() {
mov edi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
test eax, eax;
jz end;
sfall/Modules/Scripting/Handlers/Perks.cpp
+43 -43
View File
@@ -34,7 +34,7 @@ void __declspec(naked) op_get_perk_owed() {
mov ecx, eax;
movzx edx, byte ptr ds : [FO_VAR_free_perk];
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
popad;
@@ -50,7 +50,7 @@ void __declspec(naked) op_set_perk_owed() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xff;
cmp eax, 250;
@@ -70,7 +70,7 @@ void __declspec(naked) op_set_perk_freq() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call SetPerkFreq;
@@ -88,7 +88,7 @@ void __declspec(naked) op_get_perk_available() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
cmp eax, PERK_count;
jge fail;
@@ -102,7 +102,7 @@ fail:
end:
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
popad;
@@ -124,11 +124,11 @@ void __declspec(naked) op_set_perk_name() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0x9001;
cmp si, VAR_TYPE_STR2;
jz next;
cmp si, 0x9801;
cmp si, VAR_TYPE_STR;
jnz end;
next:
mov ebx, edi;
@@ -160,11 +160,11 @@ void __declspec(naked) op_set_perk_desc() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0x9001;
cmp si, VAR_TYPE_STR2;
jz next;
cmp si, 0x9801;
cmp si, VAR_TYPE_STR;
jnz end;
next:
mov ebx, edi;
@@ -198,9 +198,9 @@ void __declspec(naked) op_set_perk_value() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz fail;
push edi;
push eax;
@@ -243,21 +243,21 @@ void __declspec(naked) op_set_selectable_perk() {
push eax;
movzx eax, word ptr[esp + 12];
cmp eax, 0xc001;
cmp eax, VAR_TYPE_INT;
jne fail;
movzx eax, word ptr[esp + 20];
cmp eax, 0xc001;
cmp eax, VAR_TYPE_INT;
jne fail;
movzx eax, word ptr ds : [esp + 4];
cmp eax, 0x9001;
cmp eax, VAR_TYPE_STR2;
je next1;
cmp eax, 0x9801;
cmp eax, VAR_TYPE_STR;
jne fail;
next1:
movzx eax, word ptr ds : [esp + 28];
cmp eax, 0x9001;
cmp eax, VAR_TYPE_STR2;
je next2;
cmp eax, 0x9801;
cmp eax, VAR_TYPE_STR;
jne fail;
next2:
mov eax, ecx;
@@ -312,21 +312,21 @@ void __declspec(naked) op_set_fake_perk() {
push eax;
movzx eax, word ptr[esp + 12];
cmp eax, 0xc001;
cmp eax, VAR_TYPE_INT;
jne fail;
movzx eax, word ptr[esp + 20];
cmp eax, 0xc001;
cmp eax, VAR_TYPE_INT;
jne fail;
movzx eax, word ptr ds : [esp + 4];
cmp eax, 0x9001;
cmp eax, VAR_TYPE_STR2;
je next1;
cmp eax, 0x9801;
cmp eax, VAR_TYPE_STR;
jne fail;
next1:
movzx eax, word ptr ds : [esp + 28];
cmp eax, 0x9001;
cmp eax, VAR_TYPE_STR2;
je next2;
cmp eax, 0x9801;
cmp eax, VAR_TYPE_STR;
jne fail;
next2:
mov eax, ecx;
@@ -385,21 +385,21 @@ void __declspec(naked) op_set_fake_trait() {
push eax;
movzx eax, word ptr[esp + 12];
cmp eax, 0xc001;
cmp eax, VAR_TYPE_INT;
jne fail;
movzx eax, word ptr[esp + 20];
cmp eax, 0xc001;
cmp eax, VAR_TYPE_INT;
jne fail;
movzx eax, word ptr ds : [esp + 4];
cmp eax, 0x9001;
cmp eax, VAR_TYPE_STR2;
je next1;
cmp eax, 0x9801;
cmp eax, VAR_TYPE_STR;
jne fail;
next1:
movzx eax, word ptr ds : [esp + 28];
cmp eax, 0x9001;
cmp eax, VAR_TYPE_STR2;
je next2;
cmp eax, 0x9801;
cmp eax, VAR_TYPE_STR;
jne fail;
next2:
mov eax, ecx;
@@ -440,9 +440,9 @@ void __declspec(naked) op_set_perkbox_title() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz end;
next:
mov ebx, eax;
@@ -509,9 +509,9 @@ void __declspec(naked) op_has_fake_perk() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz end;
next:
mov ebx, eax;
@@ -524,7 +524,7 @@ end:
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov eax, edi;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
pop edi;
pop edx;
@@ -545,9 +545,9 @@ void __declspec(naked) op_has_fake_trait() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz end;
next:
mov ebx, eax;
@@ -560,7 +560,7 @@ end:
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov eax, edi;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call fo::funcoffs::interpretPushShort_;
pop edi;
pop edx;
@@ -580,7 +580,7 @@ void __declspec(naked) op_perk_add_mode() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call AddPerkMode;
@@ -600,7 +600,7 @@ void __declspec(naked) op_remove_trait() {
mov edi, eax;
mov eax, ebp;
call fo::funcoffs::interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
xor ebx, ebx;
dec ebx;
@@ -630,7 +630,7 @@ void __declspec(naked) op_set_pyromaniac_mod() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push 0x424AB6;
@@ -666,7 +666,7 @@ void __declspec(naked) op_set_swiftlearner_mod() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push 0x4AFAE2;
sfall/Modules/Scripting/Handlers/Stats.cpp
+63 -63
View File
@@ -52,9 +52,9 @@ void __declspec(naked) op_set_pc_base_stat() {
call fo::funcoffs::interpretPopLong_;
//eax now contains the stat ID, edi contains its new value
//Check args are valid
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
test eax, eax;
jl end;
@@ -95,9 +95,9 @@ void __declspec(naked) op_set_pc_extra_stat() {
call fo::funcoffs::interpretPopLong_;
//eax now contains the stat ID, edi contains its new value
//Check args are valid
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
test eax, eax;
jl end;
@@ -129,7 +129,7 @@ void __declspec(naked) op_get_pc_base_stat() {
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
//Check arg is valid
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jl fail;
@@ -144,7 +144,7 @@ end:
//Pass back the result
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -168,7 +168,7 @@ void __declspec(naked) op_get_pc_extra_stat() {
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
//Check arg is valid
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jl fail;
@@ -183,7 +183,7 @@ end:
//Pass back the result
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -223,13 +223,13 @@ void __declspec(naked) op_set_critter_base_stat() {
//eax now contains the critter ID, esi the stat ID, and edi the new value
//Check args are valid
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
mov ebx, [esp + 4];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
mov ebx, [esp + 8];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
test esi, esi;
jl end;
@@ -283,13 +283,13 @@ void __declspec(naked) op_set_critter_extra_stat() {
//eax now contains the critter ID, esi the stat ID, and edi the new value
//Check args are valid
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
mov ebx, [esp + 4];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
mov ebx, [esp + 8];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
test esi, esi;
jl end;
@@ -336,10 +336,10 @@ void __declspec(naked) op_get_critter_base_stat() {
//eax contains the critter pointer, and edi contains the stat id
//Check args are valid
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz fail;
mov ebx, [esp + 4];
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz fail;
test edi, edi;
jl fail;
@@ -359,7 +359,7 @@ end:
//Pass back the result
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -394,10 +394,10 @@ void __declspec(naked) op_get_critter_extra_stat() {
//eax contains the critter pointer, and edi contains the stat id
//Check args are valid
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz fail;
mov ebx, [esp + 4];
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz fail;
test edi, edi;
jl fail;
@@ -417,7 +417,7 @@ end:
//Pass back the result
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -454,13 +454,13 @@ void __declspec(naked) op_set_critter_skill_points() {
//eax now contains the critter ID, esi the skill ID, and edi the new value
//Check args are valid
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
mov ebx, [esp + 4];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
mov ebx, [esp + 8];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz end;
test esi, esi;
jl end;
@@ -498,10 +498,10 @@ void __declspec(naked) op_get_critter_skill_points() {
//eax now contains the critter ID, esi the skill ID
//Check args are valid
mov ebx, [esp];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz fail;
mov ebx, [esp + 4];
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jnz fail;
test esi, esi;
jl fail;
@@ -519,7 +519,7 @@ fail:
end:
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -536,7 +536,7 @@ void __declspec(naked) op_set_available_skill_points() {
call fo::funcoffs::interpretPopShort_;
xchg eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp cx, 0xc001;
cmp cx, VAR_TYPE_INT;
jnz end;
mov edx, eax;
xor eax, eax;
@@ -553,7 +553,7 @@ void __declspec(naked) op_get_available_skill_points() {
mov ecx, eax;
mov edx, dword ptr ds : [FO_VAR_curr_pc_stat];
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_
popad;
@@ -568,7 +568,7 @@ void __declspec(naked) op_mod_skill_points_per_level() {
call fo::funcoffs::interpretPopShort_;
xchg eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp cx, 0xc001;
cmp cx, VAR_TYPE_INT;
jnz end;
cmp eax, 100;
jg end;
@@ -597,7 +597,7 @@ void __declspec(naked) op_get_critter_current_ap() {
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
//Check args are valid
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz fail;
mov edx, [eax + 0x40];
jmp end;
@@ -607,7 +607,7 @@ end:
//Pass back the result
mov eax, ecx;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
//Restore registers and return
@@ -639,9 +639,9 @@ void __declspec(naked) op_set_critter_current_ap() {
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
//Check args are valid
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
mov[eax + 0x40], ebx;
mov ecx, ds:[FO_VAR_obj_dude]
@@ -672,7 +672,7 @@ void __declspec(naked) op_set_pickpocket_max() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xff;
cmp eax, 100;
@@ -701,7 +701,7 @@ void __declspec(naked) op_set_hit_chance_max() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xff;
cmp eax, 100;
@@ -728,21 +728,21 @@ void __declspec(naked) op_set_critter_hit_chance_mod() {
mov edi, eax;
xor ebx, ebx
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
@@ -770,14 +770,14 @@ void __declspec(naked) op_set_base_hit_chance_mod() {
mov edi, eax;
xor ebx, ebx
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
@@ -805,21 +805,21 @@ void __declspec(naked) op_set_critter_pickpocket_mod() {
mov edi, eax;
xor ebx, ebx
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
@@ -847,14 +847,14 @@ void __declspec(naked) op_set_base_pickpocket_mod() {
mov edi, eax;
xor ebx, ebx
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
@@ -882,14 +882,14 @@ void __declspec(naked) op_set_critter_skill_mod() {
mov edi, eax;
xor ebx, ebx
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
@@ -916,7 +916,7 @@ void __declspec(naked) op_set_base_skill_mod() {
mov edi, eax;
xor ebx, ebx
call fo::funcoffs::interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call fo::funcoffs::interpretPopLong_;
@@ -946,7 +946,7 @@ void __declspec(naked) op_set_skill_max() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xffff;
cmp eax, 300;
@@ -981,9 +981,9 @@ void __declspec(naked) op_set_stat_max() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
push edi;
push eax;
@@ -1019,9 +1019,9 @@ void __declspec(naked) op_set_stat_min() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
push edi;
push eax;
@@ -1057,9 +1057,9 @@ void __declspec(naked) op_set_pc_stat_max() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
push edi;
push eax;
@@ -1092,9 +1092,9 @@ void __declspec(naked) op_set_pc_stat_min() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
push edi;
push eax;
@@ -1127,9 +1127,9 @@ void __declspec(naked) op_set_npc_stat_max() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
push edi;
push eax;
@@ -1162,9 +1162,9 @@ void __declspec(naked) op_set_npc_stat_min() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
push edi;
push eax;
@@ -1235,7 +1235,7 @@ void __declspec(naked) op_set_xp_mod() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xffff;
push eax;
@@ -1260,7 +1260,7 @@ void __declspec(naked) op_set_perk_level_mod() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call SetPerkLevelMod2;
sfall/Modules/Scripting/Handlers/Worldmap.cpp
+9 -9
View File
@@ -77,7 +77,7 @@ void __declspec(naked) op_force_encounter() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push 0;
push eax;
@@ -104,9 +104,9 @@ void __declspec(naked) op_force_encounter_with_flags() {
mov edi, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
push ebx;
push eax;
@@ -129,7 +129,7 @@ void __declspec(naked) op_in_world_map() {
mov edx, eax;
mov eax, esi;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, esi;
call fo::funcoffs::interpretPushShort_;
pop esi;
@@ -148,7 +148,7 @@ void __declspec(naked) op_get_game_mode() {
mov edx, eax;
mov eax, edi;
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call fo::funcoffs::interpretPushShort_;
popad;
@@ -164,7 +164,7 @@ void __declspec(naked) op_get_world_map_x_pos() {
mov ecx, eax;
mov edx, ds:[FO_VAR_world_xpos];
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -182,7 +182,7 @@ void __declspec(naked) op_get_world_map_y_pos() {
mov ecx, eax;
mov edx, ds:[FO_VAR_world_ypos];
call fo::funcoffs::interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call fo::funcoffs::interpretPushShort_;
pop edx;
@@ -210,9 +210,9 @@ void __declspec(naked) op_set_world_map_pos() {
mov edx, eax;
mov eax, ecx;
call fo::funcoffs::interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
mov ds : [FO_VAR_world_xpos], eax;
mov ds : [FO_VAR_world_ypos], edi;