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 hex values with proper VAR_TYPE_* defines for code readability.

Browse Source
This commit is contained in:
NovaRain
2017-12-03 23:29:28 +08:00
parent 813abbf452
commit 866c9165c0
12 changed files with 407 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/ScriptExtender.cpp
+22 -22
View File
@@ -469,7 +469,7 @@ static void __declspec(naked) SetGlobalScriptRepeat() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push ecx;
@@ -500,7 +500,7 @@ static void __declspec(naked) SetGlobalScriptType() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push ecx;
@@ -520,7 +520,7 @@ static void __declspec(naked) GetGlobalScriptTypes() {
mov edx, AvailableGlobalScriptTypes;
mov ecx, eax;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -561,11 +561,11 @@ static void __declspec(naked) SetGlobalVar() {
mov edx, eax;
mov eax, edi;
call 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;
@@ -612,11 +612,11 @@ static void __declspec(naked) GetGlobalVarInt() {
mov esi, eax;
mov eax, edi;
call 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 GetGlobalVar2Int;
@@ -633,7 +633,7 @@ next:
end:
mov eax, edi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
pop esi;
@@ -657,11 +657,11 @@ static void __declspec(naked) GetGlobalVarFloat() {
mov esi, eax;
mov eax, edi;
call 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 GetGlobalVar2Int;
@@ -678,7 +678,7 @@ next:
end:
mov eax, edi;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, edi;
call interpretPushShort_;
pop esi;
@@ -700,7 +700,7 @@ static void __declspec(naked) GetSfallArg() {
mov eax, ecx;
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -723,7 +723,7 @@ static void __declspec(naked) GetSfallArgs() {
mov eax, ecx;
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -743,9 +743,9 @@ static void __declspec(naked) SetSfallArg() {
mov esi, eax;
mov eax, ecx;
call 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;
@@ -765,7 +765,7 @@ static void __declspec(naked) SetSfallReturn() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call SetHSReturn;
@@ -784,7 +784,7 @@ static void __declspec(naked) InitHook() {
mov edx, InitingHookScripts;
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
pop edx;
pop ecx;
@@ -810,7 +810,7 @@ static void __declspec(naked) set_self() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
push eax;
push ebp;
@@ -828,7 +828,7 @@ static void __declspec(naked) register_hook() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
push -1;
push eax;
sfall/ScriptOps/FileSystemOps.hpp
+42 -42
View File
@@ -37,12 +37,12 @@ static void __declspec(naked) fs_create() {
mov edx, eax;
mov eax, edi;
call 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;
@@ -59,7 +59,7 @@ end:
mov eax, edi;
call interpretPushLong_;
mov eax, edi;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -79,14 +79,14 @@ static void __declspec(naked) fs_copy() {
mov esi, eax;
mov eax, ebp;
call 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;
@@ -109,7 +109,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -123,9 +123,9 @@ static void __declspec(naked) fs_find() {
mov edi, eax;
mov eax, ebp;
call 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;
@@ -143,7 +143,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -163,9 +163,9 @@ static void __declspec(naked) fs_write_byte() {
mov esi, eax;
mov eax, ebp;
call 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;
@@ -189,9 +189,9 @@ static void __declspec(naked) fs_write_short() {
mov esi, eax;
mov eax, ebp;
call 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;
@@ -215,11 +215,11 @@ static void __declspec(naked) fs_write_int() {
mov esi, eax;
mov eax, ebp;
call 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;
@@ -245,12 +245,12 @@ static void __declspec(naked) fs_write_string() {
mov eax, edi;
call 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;
@@ -279,12 +279,12 @@ static void __declspec(naked) fs_write_bstring() {
mov eax, edi;
call 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;
@@ -306,7 +306,7 @@ static void __declspec(naked) fs_read_byte() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_byte;
@@ -319,7 +319,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -333,7 +333,7 @@ static void __declspec(naked) fs_read_short() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_short;
@@ -346,7 +346,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -360,7 +360,7 @@ static void __declspec(naked) fs_read_int() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_int;
@@ -373,7 +373,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -387,7 +387,7 @@ static void __declspec(naked) fs_read_float() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSread_int;
@@ -400,7 +400,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
call interpretPushShort_;
popad;
retn;
@@ -414,7 +414,7 @@ static void __declspec(naked) fs_delete() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end
push eax;
call FSdelete;
@@ -431,7 +431,7 @@ static void __declspec(naked) fs_size() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSsize;
@@ -444,7 +444,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -458,7 +458,7 @@ static void __declspec(naked) fs_pos() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call FSpos;
@@ -471,7 +471,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -491,9 +491,9 @@ static void __declspec(naked) fs_seek() {
mov esi, eax;
mov eax, ebp;
call 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;
@@ -517,9 +517,9 @@ static void __declspec(naked) fs_resize() {
mov esi, eax;
mov eax, ebp;
call 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/ScriptOps/GraphicsOp.hpp
+32 -32
View File
@@ -37,7 +37,7 @@ static void __declspec(naked) GraphicsFuncsAvailable() {
inc edx;
end:
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -57,9 +57,9 @@ static void __declspec(naked) funcLoadShader() {
mov edx, eax;
mov eax, edi;
call 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;
@@ -74,7 +74,7 @@ error:
result:
mov eax, edi;
call interpretPushLong_;
mov edx, 0xC001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
pop edi;
@@ -94,7 +94,7 @@ static void __declspec(naked) funcFreeShader() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call FreeShader;
@@ -115,7 +115,7 @@ static void __declspec(naked) funcActivateShader() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call ActivateShader;
@@ -136,7 +136,7 @@ static void __declspec(naked) funcDeactivateShader() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call DeactivateShader;
@@ -167,10 +167,10 @@ static void __declspec(naked) funcGetShaderTexture() {
mov eax, ecx;
call 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;
@@ -186,7 +186,7 @@ end:
//Pass back the result
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -227,14 +227,14 @@ static void __declspec(naked) funcSetShaderInt() {
call 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;
@@ -283,14 +283,14 @@ static void __declspec(naked) funcSetShaderTexture() {
call 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;
@@ -339,19 +339,19 @@ static void __declspec(naked) funcSetShaderFloat() {
call 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;
@@ -392,20 +392,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];
@@ -437,7 +437,7 @@ static void __declspec(naked) funcGetShaderVersion() {
mov edx, eax;
mov eax, edi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
pop edi;
@@ -464,9 +464,9 @@ static void __declspec(naked) funcSetShaderMode() {
mov esi, eax;
mov eax, ecx;
call 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;
@@ -491,7 +491,7 @@ static void __declspec(naked) funcForceGraphicsRefresh() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call ForceGraphicsRefresh;
sfall/ScriptOps/InterfaceOp.hpp
+20 -20
View File
@@ -32,7 +32,7 @@ static void __declspec(naked) InputFuncsAvailable() {
mov ecx, eax;
mov edx, 1; //They're always available from 2.9 on
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -51,7 +51,7 @@ static void __declspec(naked) KeyPressed() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
push ecx;
push eax;
@@ -64,7 +64,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -83,7 +83,7 @@ static void __declspec(naked) funcTapKey() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
test eax, eax;
jl end;
@@ -109,7 +109,7 @@ static void __declspec(naked) get_mouse_x() {
add edx, ds:[_mouse_hotx];
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_
pop edx;
pop ecx;
@@ -127,7 +127,7 @@ static void __declspec(naked) get_mouse_y() {
add edx, ds:[_mouse_hoty];
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_
pop edx;
pop ecx;
@@ -144,7 +144,7 @@ static void __declspec(naked) get_mouse_buttons() {
mov edx, ds:[_last_buttons];
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_
pop edx;
pop ecx;
@@ -161,7 +161,7 @@ static void __declspec(naked) get_window_under_mouse() {
mov edx, ds:[_last_button_winID];
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_
pop edx;
pop ecx;
@@ -179,7 +179,7 @@ static void __declspec(naked) get_screen_width() {
inc edx
call interpretPushLong_
pop eax
mov edx, 0xc001
mov edx, VAR_TYPE_INT
call interpretPushShort_
pop edx
retn
@@ -196,7 +196,7 @@ static void __declspec(naked) get_screen_height() {
inc edx
call interpretPushLong_
pop eax
mov edx, 0xc001
mov edx, VAR_TYPE_INT
call interpretPushShort_
pop edx
retn
@@ -238,9 +238,9 @@ static void __declspec(naked) create_message_window() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -276,7 +276,7 @@ static void __declspec(naked) GetViewportX() {
mov ecx, eax;
mov edx, ds:[_wmWorldOffsetX];
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -293,7 +293,7 @@ static void __declspec(naked) GetViewportY() {
mov ecx, eax;
mov edx, ds:[_wmWorldOffsetY];
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -312,7 +312,7 @@ static void __declspec(naked) SetViewportX() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
mov ds:[_wmWorldOffsetX], eax
end:
@@ -332,7 +332,7 @@ static void __declspec(naked) SetViewportY() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
mov ds:[_wmWorldOffsetY], eax
end:
@@ -351,7 +351,7 @@ static void __declspec(naked) ShowIfaceTag() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp eax, 3;
je falloutfunc;
@@ -376,7 +376,7 @@ static void __declspec(naked) HideIfaceTag() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp eax, 3;
je falloutfunc;
@@ -402,7 +402,7 @@ static void __declspec(naked) IsIfaceTagActive() {
mov edx, eax;
mov eax, ebx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
cmp eax, 3;
je falloutfunc;
@@ -433,7 +433,7 @@ end:
mov eax, ebx;
call interpretPushLong_;
mov eax, ebx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
add esp, 4;
popad;
sfall/ScriptOps/MemoryOp.hpp
+19 -19
View File
@@ -32,7 +32,7 @@ static void __declspec(naked) ReadByte() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
movzx edx, byte ptr ds:[eax];
jmp result;
@@ -41,7 +41,7 @@ error:
result:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -60,7 +60,7 @@ static void __declspec(naked) ReadShort() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
movzx edx, word ptr ds:[eax];
jmp result;
@@ -69,7 +69,7 @@ error:
result:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -88,7 +88,7 @@ static void __declspec(naked) ReadInt() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
mov edx, dword ptr ds:[eax];
jmp result;
@@ -97,7 +97,7 @@ error:
result:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -116,7 +116,7 @@ static void __declspec(naked) ReadString() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz error;
mov edx, eax;
jmp result;
@@ -125,7 +125,7 @@ error:
result:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0x9801;
mov edx, VAR_TYPE_STR;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -148,9 +148,9 @@ static void __declspec(naked) WriteByte() {
mov edi, eax;
mov eax, ecx;
call 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;
@@ -176,9 +176,9 @@ static void __declspec(naked) WriteShort() {
mov edi, eax;
mov eax, ecx;
call 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;
@@ -204,9 +204,9 @@ static void __declspec(naked) WriteInt() {
mov edi, eax;
mov eax, ecx;
call 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;
@@ -242,11 +242,11 @@ static void __declspec(naked) WriteString() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -273,7 +273,7 @@ static void _stdcall CallOffsetInternal(DWORD func, DWORD script) {
__asm {
mov eax, script;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
jz legal;
inc illegalarg;
legal:
@@ -304,7 +304,7 @@ legal:
mov edx, args[0];
call interpretPushLong_;
mov eax, script;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
}
}
sfall/ScriptOps/MiscOps.hpp
+83 -83
View File
File diff suppressed because it is too large Load Diff
sfall/ScriptOps/ObjectsOps.hpp
+15 -15
View File
@@ -38,7 +38,7 @@ static void __declspec(naked) RemoveScript() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz end;
test eax, eax;
jz end;
@@ -71,9 +71,9 @@ static void __declspec(naked) SetScript() {
mov edi, eax;
mov eax, ecx;
call 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;
@@ -178,7 +178,7 @@ static void __declspec(naked) GetScript() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jz fail;
@@ -194,7 +194,7 @@ end:
mov eax, ecx;
call interpretPushLong_;
mov eax, ecx;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -215,9 +215,9 @@ static void __declspec(naked) set_critter_burst_disable() {
mov esi, eax;
mov eax, ebp;
call 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;
@@ -235,7 +235,7 @@ static void __declspec(naked) get_weapon_ammo_pid() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jz fail;
@@ -248,7 +248,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -268,9 +268,9 @@ static void __declspec(naked) set_weapon_ammo_pid() {
mov esi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
test eax, eax;
jz end;
@@ -288,7 +288,7 @@ static void __declspec(naked) get_weapon_ammo_count() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jz fail;
@@ -301,7 +301,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -321,9 +321,9 @@ static void __declspec(naked) set_weapon_ammo_count() {
mov esi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
cmp si, 0xc001;
cmp si, VAR_TYPE_INT;
jnz end;
test eax, eax;
jz end;
sfall/ScriptOps/PerksOp.hpp
+43 -43
View File
@@ -28,7 +28,7 @@ static void __declspec(naked) GetPerkOwed() {
mov ecx, eax;
movzx edx, byte ptr ds:[_free_perk];
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
popad;
@@ -43,7 +43,7 @@ static void __declspec(naked) SetPerkOwed() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xff;
cmp eax, 250;
@@ -62,7 +62,7 @@ static void __declspec(naked) set_perk_freq() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call SetPerkFreq;
@@ -79,7 +79,7 @@ static void __declspec(naked) GetPerkAvailable() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
cmp eax, PERK_count;
jge fail;
@@ -93,7 +93,7 @@ fail:
end:
mov eax, ecx
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
popad;
@@ -114,11 +114,11 @@ static void __declspec(naked) funcSetPerkName() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -149,11 +149,11 @@ static void __declspec(naked) funcSetPerkDesc() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -186,9 +186,9 @@ static void __declspec(naked) funcSetPerkValue() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -231,21 +231,21 @@ static void __declspec(naked) fSetSelectablePerk() {
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;
@@ -299,21 +299,21 @@ static void __declspec(naked) fSetFakePerk() {
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;
@@ -371,21 +371,21 @@ static void __declspec(naked) fSetFakeTrait() {
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;
@@ -425,9 +425,9 @@ static void __declspec(naked) fSetPerkboxTitle() {
mov edx, eax;
mov eax, edi;
call 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;
@@ -490,9 +490,9 @@ static void __declspec(naked) fHasFakePerk() {
mov edx, eax;
mov eax, edi;
call 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;
@@ -505,7 +505,7 @@ end:
mov eax, edi;
call interpretPushLong_;
mov eax, edi;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
pop edi;
pop edx;
@@ -525,9 +525,9 @@ static void __declspec(naked) fHasFakeTrait() {
mov edx, eax;
mov eax, edi;
call 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;
@@ -540,7 +540,7 @@ end:
mov eax, edi;
call interpretPushLong_;
mov eax, edi;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
pop edi;
pop edx;
@@ -559,7 +559,7 @@ static void __declspec(naked) fAddPerkMode() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call AddPerkMode;
@@ -578,7 +578,7 @@ static void __declspec(naked) remove_trait() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
xor ebx, ebx;
dec ebx;
@@ -608,7 +608,7 @@ static void __declspec(naked) SetPyromaniacMod() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push 0x424AB6;
@@ -643,7 +643,7 @@ static void __declspec(naked) SetSwiftLearnerMod() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
push 0x4AFAE2;
sfall/ScriptOps/ScriptArrays.hpp
+26 -26
View File
@@ -32,9 +32,9 @@ static void __declspec(naked) create_array() {
mov edx, eax;
mov eax, edi;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jne fail;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jne fail;
push ecx;
push eax;
@@ -46,7 +46,7 @@ fail:
end:
mov eax, edi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
popad;
@@ -76,14 +76,14 @@ static void __declspec(naked) set_array() {
call interpretPopLong_;
xchg eax, edi; // arrayID
//Error check:
cmp bx, 0xC001;
cmp bx, VAR_TYPE_INT;
jne end;
push 1; // arg 6: allow unset
push edx; // arg 5: value type
// value:
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
jz next;
cmp dx, 0x9801;
cmp dx, VAR_TYPE_STR;
jnz notstring;
next:
mov ebx, eax;
@@ -92,9 +92,9 @@ next:
notstring:
push eax; // arg 4: value
// key:
cmp cx, 0x9001;
cmp cx, VAR_TYPE_STR2;
jz next1;
cmp cx, 0x9801;
cmp cx, VAR_TYPE_STR;
jnz notstring1;
next1:
mov edx, ecx;
@@ -182,9 +182,9 @@ notstring1:
jmp end;
fail:
xor edx, edx;
mov ebx, 0xc001;
mov ebx, VAR_TYPE_INT;
end:
cmp bx, 0x9801;
cmp bx, VAR_TYPE_STR;
jne notstring;
mov eax, ebp;
call interpretAddString_;
@@ -207,7 +207,7 @@ static void __declspec(naked) free_array() {
mov ebx, eax;
mov eax, edi;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jne end;
push eax;
call FreeArray;
@@ -224,7 +224,7 @@ static void __declspec(naked) len_array() {
mov ebx, eax;
mov eax, edi;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jne fail;
push eax;
call LenArray;
@@ -235,7 +235,7 @@ fail:
end:
mov eax, edi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
popad;
@@ -260,9 +260,9 @@ static void __declspec(naked) resize_array() {
mov esi, eax;
mov eax, ebp;
//Error check
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jne end;
cmp cx, 0xc001;
cmp cx, VAR_TYPE_INT;
jne end;
push edi;
push esi;
@@ -286,9 +286,9 @@ static void __declspec(naked) temp_array() {
mov edx, eax;
mov eax, edi;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jne fail;
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jne fail;
push ecx;
push eax;
@@ -300,7 +300,7 @@ fail:
end:
mov eax, edi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
popad;
@@ -315,7 +315,7 @@ static void __declspec(naked) fix_array() {
mov ebx, eax;
mov eax, edi;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jne end;
push eax;
call FixArray;
@@ -570,7 +570,7 @@ static void __declspec(naked) list_begin() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call list_begin2;
@@ -583,7 +583,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -597,7 +597,7 @@ static void __declspec(naked) list_as_array() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call list_as_array2;
@@ -610,7 +610,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -624,7 +624,7 @@ static void __declspec(naked) list_next() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz fail;
push eax;
call list_next2;
@@ -637,7 +637,7 @@ end:
mov eax, ebp;
call interpretPushLong_;
mov eax, ebp;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
call interpretPushShort_;
popad;
retn;
@@ -651,7 +651,7 @@ static void __declspec(naked) list_end() {
mov edi, eax;
mov eax, ebp;
call interpretPopLong_;
cmp di, 0xc001;
cmp di, VAR_TYPE_INT;
jnz end;
push eax;
call list_end2;
sfall/ScriptOps/ScriptUtils.hpp
+33 -33
View File
@@ -37,13 +37,13 @@ static void __declspec(naked) funcSqrt() {
mov ebx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz arg1l2;
mov [esp], eax;
fild [esp];
jmp calc;
arg1l2:
cmp bx, 0xa001;
cmp bx, VAR_TYPE_FLOAT;
jnz fail;
mov [esp], eax;
fld [esp];
@@ -59,7 +59,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ecx;
call interpretPushShort_;
add esp, 4;
@@ -76,13 +76,13 @@ static void __declspec(naked) funcAbs() {
mov ebx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz arg1l2;
mov [esp], eax;
fild [esp];
jmp calc;
arg1l2:
cmp bx, 0xa001;
cmp bx, VAR_TYPE_FLOAT;
jnz fail;
mov [esp], eax;
fld [esp];
@@ -98,7 +98,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ecx;
call interpretPushShort_;
add esp, 4;
@@ -115,13 +115,13 @@ static void __declspec(naked) funcSin() {
mov ebx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz arg1l2;
mov [esp], eax;
fild [esp];
jmp calc;
arg1l2:
cmp bx, 0xa001;
cmp bx, VAR_TYPE_FLOAT;
jnz fail;
mov [esp], eax;
fld [esp];
@@ -137,7 +137,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ecx;
call interpretPushShort_;
add esp, 4;
@@ -154,13 +154,13 @@ static void __declspec(naked) funcCos() {
mov ebx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz arg1l2;
mov [esp], eax;
fild [esp];
jmp calc;
arg1l2:
cmp bx, 0xa001;
cmp bx, VAR_TYPE_FLOAT;
jnz fail;
mov [esp], eax;
fld [esp];
@@ -176,7 +176,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ecx;
call interpretPushShort_;
add esp, 4;
@@ -193,13 +193,13 @@ static void __declspec(naked) funcTan() {
mov ebx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz arg1l2;
mov [esp], eax;
fild [esp];
jmp calc;
arg1l2:
cmp bx, 0xa001;
cmp bx, VAR_TYPE_FLOAT;
jnz fail;
mov [esp], eax;
fld [esp];
@@ -216,7 +216,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ecx;
call interpretPushShort_;
add esp, 4;
@@ -239,24 +239,24 @@ static void __declspec(naked) funcATan() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp bx, 0xc001;
cmp bx, VAR_TYPE_INT;
jnz arg1l2;
mov [esp], eax;
fild [esp];
jmp arg2l1;
arg1l2:
cmp bx, 0xa001;
cmp bx, VAR_TYPE_FLOAT;
jnz fail;
mov [esp], eax;
fld [esp];
arg2l1:
cmp dx, 0xc001;
cmp dx, VAR_TYPE_INT;
jnz arg2l2;
mov [esp], edi;
fild [esp];
jmp calc;
arg2l2:
cmp dx, 0xa001;
cmp dx, VAR_TYPE_FLOAT;
jnz fail2;
mov [esp], edi;
fld [esp];
@@ -274,7 +274,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ecx;
call interpretPushShort_;
add esp, 4;
@@ -327,14 +327,14 @@ static void __declspec(naked) string_split() {
mov eax, ebp;
call interpretPopLong_;
mov esi, eax;
cmp bx, 0x9001;
cmp bx, VAR_TYPE_STR2;
jz str1;
cmp bx, 0x9801;
cmp bx, VAR_TYPE_STR;
jnz fail;
str1:
cmp cx, 0x9001;
cmp cx, VAR_TYPE_STR2;
jz str2;
cmp cx, 0x9801;
cmp cx, VAR_TYPE_STR;
jnz fail;
str2:
mov eax, ebp;
@@ -356,7 +356,7 @@ fail:
end:
mov eax, ebp;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ebp;
call interpretPushShort_;
popad;
@@ -378,9 +378,9 @@ static void __declspec(naked) str_to_int() {
mov ebx, eax;
mov eax, ebp;
call interpretPopLong_;
cmp bx, 0x9001;
cmp bx, VAR_TYPE_STR2;
jz str1;
cmp bx, 0x9801;
cmp bx, VAR_TYPE_STR;
jnz fail;
str1:
mov edx, ebx;
@@ -396,7 +396,7 @@ fail:
end:
mov eax, ebp;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ebp;
call interpretPushShort_;
popad;
@@ -411,9 +411,9 @@ static void __declspec(naked) str_to_flt() {
mov ebx, eax;
mov eax, ebp;
call interpretPopLong_;
cmp bx, 0x9001;
cmp bx, VAR_TYPE_STR2;
jz str1;
cmp bx, 0x9801;
cmp bx, VAR_TYPE_STR;
jnz fail;
str1:
mov edx, ebx;
@@ -429,7 +429,7 @@ fail:
end:
mov eax, ebp;
call interpretPushLong_;
mov edx, 0xa001;
mov edx, VAR_TYPE_FLOAT;
mov eax, ebp;
call interpretPushShort_;
popad;
@@ -651,12 +651,12 @@ static void __declspec(naked) op_sprintf() {
call interpretPopLong_; // format string
mov esi, eax;
// check types
cmp cx, 0x9001;
cmp cx, VAR_TYPE_STR2;
je nextarg;
cmp cx, VAR_TYPE_STR;
jne fail;
nextarg:
cmp dx, 0x9001;
cmp dx, VAR_TYPE_STR2;
je next2;
cmp dx, VAR_TYPE_STR;
jne notstring;
sfall/ScriptOps/StatsOp.hpp
+63 -63
View File
@@ -49,9 +49,9 @@ static void __declspec(naked) SetPCBaseStat() {
call 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;
@@ -91,9 +91,9 @@ static void __declspec(naked) SetPCExtraStat() {
call 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;
@@ -124,7 +124,7 @@ static void __declspec(naked) GetPCBaseStat() {
mov eax, ecx;
call interpretPopLong_;
//Check arg is valid
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jl fail;
@@ -139,7 +139,7 @@ end:
//Pass back the result
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -162,7 +162,7 @@ static void __declspec(naked) GetPCExtraStat() {
mov eax, ecx;
call interpretPopLong_;
//Check arg is valid
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz fail;
test eax, eax;
jl fail;
@@ -177,7 +177,7 @@ end:
//Pass back the result
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -216,13 +216,13 @@ static void __declspec(naked) SetCritterBaseStat() {
//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;
@@ -275,13 +275,13 @@ static void __declspec(naked) SetCritterExtraStat() {
//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;
@@ -327,10 +327,10 @@ static void __declspec(naked) GetCritterBaseStat() {
//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;
@@ -350,7 +350,7 @@ end:
//Pass back the result
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -384,10 +384,10 @@ static void __declspec(naked) GetCritterExtraStat() {
//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;
@@ -407,7 +407,7 @@ end:
//Pass back the result
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -443,13 +443,13 @@ static void __declspec(naked) 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;
@@ -486,10 +486,10 @@ static void __declspec(naked) 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;
@@ -507,7 +507,7 @@ fail:
end:
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -523,7 +523,7 @@ static void __declspec(naked) set_available_skill_points() {
call interpretPopShort_;
xchg eax, ecx;
call interpretPopLong_;
cmp cx, 0xc001;
cmp cx, VAR_TYPE_INT;
jnz end;
mov edx, eax;
xor eax, eax;
@@ -539,7 +539,7 @@ static void __declspec(naked) get_available_skill_points() {
mov ecx, eax;
mov edx, dword ptr ds:[_curr_pc_stat];
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_
popad;
@@ -553,7 +553,7 @@ static void __declspec(naked) mod_skill_points_per_level() {
call interpretPopShort_;
xchg eax, ecx;
call interpretPopLong_;
cmp cx, 0xc001;
cmp cx, VAR_TYPE_INT;
jnz end;
cmp eax, 100;
jg end;
@@ -581,7 +581,7 @@ static void __declspec(naked) GetCritterAP() {
mov eax, ecx;
call interpretPopLong_;
//Check args are valid
cmp di, 0xC001;
cmp di, VAR_TYPE_INT;
jnz fail;
mov edx, [eax+0x40];
jmp end;
@@ -591,7 +591,7 @@ end:
//Pass back the result
mov eax, ecx;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
//Restore registers and return
@@ -623,9 +623,9 @@ static void __declspec(naked) SetCritterAP() {
mov eax, ecx;
call 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:[_obj_dude]
@@ -657,7 +657,7 @@ static void __declspec(naked) fSetPickpocketMax() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xff;
cmp eax, 100;
@@ -685,7 +685,7 @@ static void __declspec(naked) fSetHitChanceMax() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xff;
cmp eax, 100;
@@ -711,21 +711,21 @@ static void __declspec(naked) SetCritterHitChance() {
mov edi, eax;
xor ebx, ebx
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov edx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
@@ -752,14 +752,14 @@ static void __declspec(naked) SetBaseHitChance() {
mov edi, eax;
xor ebx, ebx
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
@@ -786,21 +786,21 @@ static void __declspec(naked) SetCritterPickpocket() {
mov edi, eax;
xor ebx, ebx
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov edx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
@@ -827,14 +827,14 @@ static void __declspec(naked) SetBasePickpocket() {
mov edi, eax;
xor ebx, ebx
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
@@ -861,14 +861,14 @@ static void __declspec(naked) SetCritterSkillMod() {
mov edi, eax;
xor ebx, ebx
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
mov ecx, eax;
mov eax, edi;
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
@@ -894,7 +894,7 @@ static void __declspec(naked) SetBaseSkillMod() {
mov edi, eax;
xor ebx, ebx
call interpretPopShort_;
cmp ax, 0xc001;
cmp ax, VAR_TYPE_INT;
cmovne ebx, edi;
mov eax, edi;
call interpretPopLong_;
@@ -923,7 +923,7 @@ static void __declspec(naked) fSetSkillMax() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xffff;
cmp eax, 300;
@@ -957,9 +957,9 @@ static void __declspec(naked) SetStatMax() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -994,9 +994,9 @@ static void __declspec(naked) SetStatMin() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -1031,9 +1031,9 @@ static void __declspec(naked) fSetPCStatMax() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -1065,9 +1065,9 @@ static void __declspec(naked) fSetPCStatMin() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -1099,9 +1099,9 @@ static void __declspec(naked) fSetNPCStatMax() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -1133,9 +1133,9 @@ static void __declspec(naked) fSetNPCStatMin() {
mov edx, eax;
mov eax, ecx;
call 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;
@@ -1182,7 +1182,7 @@ static void __declspec(naked) SetXpMod() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
and eax, 0xffff;
push eax;
@@ -1225,7 +1225,7 @@ static void __declspec(naked) SetPerkLevelMod() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push eax;
call SetPerkLevelMod2;
sfall/ScriptOps/WorldmapOps.hpp
+9 -9
View File
@@ -66,7 +66,7 @@ static void __declspec(naked) ForceEncounter() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
push 0;
push eax;
@@ -92,9 +92,9 @@ static void __declspec(naked) ForceEncounterWithFlags() {
mov edi, eax;
mov eax, ecx;
call 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;
@@ -117,7 +117,7 @@ static void __declspec(naked) funcInWorldMap() {
mov edx, eax;
mov eax, esi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, esi;
call interpretPushShort_;
pop esi;
@@ -135,7 +135,7 @@ static void __declspec(naked) GetGameMode() {
mov edx, eax;
mov eax, edi;
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, edi;
call interpretPushShort_;
popad;
@@ -150,7 +150,7 @@ static void __declspec(naked) GetWorldMapXPos() {
mov ecx, eax;
mov edx, ds:[_world_xpos];
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -167,7 +167,7 @@ static void __declspec(naked) GetWorldMapYPos() {
mov ecx, eax;
mov edx, ds:[_world_ypos];
call interpretPushLong_;
mov edx, 0xc001;
mov edx, VAR_TYPE_INT;
mov eax, ecx;
call interpretPushShort_;
pop edx;
@@ -194,9 +194,9 @@ static void __declspec(naked) SetWorldMapPos() {
mov edx, eax;
mov eax, ecx;
call interpretPopLong_;
cmp dx, 0xC001;
cmp dx, VAR_TYPE_INT;
jnz end;
cmp si, 0xC001;
cmp si, VAR_TYPE_INT;
jnz end;
mov ds:[_world_xpos], eax;
mov ds:[_world_ypos], edi;