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

Fixed the error handling in win_fill_color

Browse Source 
Some code fixes.
This commit is contained in:
NovaRain
2020-10-25 08:07:49 +08:00
parent e59af7e88a
commit 0988004245
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Interface.cpp
+4 -6
View File
@@ -567,14 +567,12 @@ static void __declspec(naked) main_death_scene_hook() {
}
static void __declspec(naked) display_body_hook() {
static const DWORD display_body_hook_Ret = 0x47098D;
__asm {
mov ebx, [esp + 0x60 - 0x28 + 8];
cmp ebx, 1; // check mode 0 or 1
jbe fix;
add esp, 8;
mov dword ptr [esp + 0x60 - 0x40], 0; // frm_ptr
jmp display_body_hook_Ret;
xor ebx, ebx;
jmp art_id_;
fix:
dec edx; // USE.FRM
mov ecx, 48; // INVBOX.FRM
@@ -618,7 +616,7 @@ void InterfaceInit() {
if (hrpIsEnabled == false || hrpVersionValid) SafeWrite8(0x481345, 4); // main_death_scene_
if (hrpVersionValid) SafeWrite8(HRPAddress(0x10011738), 10);
// Cosmetic fix for the background image of the character portrait on the inventory and character screens
// Cosmetic fix for the background image of the character portrait on the player's inventory screen
HookCall(0x47093C, display_body_hook);
BYTE code[11] = {
0x8B, 0xD3, // mov edx, ebx
@@ -626,7 +624,7 @@ void InterfaceInit() {
0x0F, 0xAF, 0xD3, // imul edx, ebx (y * frame width)
0x53, 0x90 // push ebx (frame width)
};
SafeWriteBytes(0x470971, code, 11);
SafeWriteBytes(0x470971, code, 11); // calculates the offset in the pixel array for x/y coordinates
}
void InterfaceExit() {
sfall/ScriptOps/InterfaceOps.hpp
+6 -8
View File
@@ -577,9 +577,8 @@ static long GetArtFIDFile(long fid, const char* &file) {
}
static void mf_draw_image() {
SelectWindowID(opHandler.program()->currentScriptWin);
if (*(DWORD*)_currentWindow == -1) {
opHandler.printOpcodeError("draw_image() - no created/selected window for the image.");
if (!SelectWindowID(opHandler.program()->currentScriptWin) || *(DWORD*)_currentWindow == -1) {
opHandler.printOpcodeError("draw_image() - no created or selected window.");
opHandler.setReturn(0);
return;
}
@@ -616,9 +615,8 @@ static void mf_draw_image() {
}
static void mf_draw_image_scaled() {
SelectWindowID(opHandler.program()->currentScriptWin);
if (*(DWORD*)_currentWindow == -1) {
opHandler.printOpcodeError("draw_image_scaled() - no created/selected window for the image.");
if (!SelectWindowID(opHandler.program()->currentScriptWin) || *(DWORD*)_currentWindow == -1) {
opHandler.printOpcodeError("draw_image_scaled() - no created or selected window.");
opHandler.setReturn(0);
return;
}
@@ -879,9 +877,9 @@ static void mf_interface_print() { // same as vanilla PrintRect
}
static void mf_win_fill_color() {
SelectWindowID(opHandler.program()->currentScriptWin);
long result = SelectWindowID(opHandler.program()->currentScriptWin);
long iWin = *(DWORD*)_currentWindow;
if (iWin == -1) {
if (!result || iWin == -1) {
opHandler.printOpcodeError("win_fill_color() - no created or selected window.");
opHandler.setReturn(-1);
return;