diff --git a/sfall/Modules/DebugEditor.cpp b/sfall/Modules/DebugEditor.cpp index 34372b06..4763dfd5 100644 --- a/sfall/Modules/DebugEditor.cpp +++ b/sfall/Modules/DebugEditor.cpp @@ -21,7 +21,7 @@ #include "..\main.h" #include "..\FalloutEngine\Fallout2.h" #include "..\InputFuncs.h" -#include "Graphics.h" +//#include "Graphics.h" #include "LoadGameHook.h" #include "ScriptExtender.h" #include "Scripting\Arrays.h" @@ -61,10 +61,6 @@ struct sArray { long flag; }; -static void DEGameWinRedraw() { - if (Graphics::mode != 0) fo::func::process_bk(); -} - static bool SetBlocking(SOCKET s, bool block) { DWORD d = !block; ioctlsocket(s, FIONBIO, &d); @@ -226,7 +222,7 @@ static void RunEditorInternal(SOCKET &s) { } break; } - DEGameWinRedraw(); + __asm call fo::funcoffs::GNW95_process_message_; } SetGlobals(sglobals); diff --git a/sfall/Modules/Interface.cpp b/sfall/Modules/Interface.cpp index e44ef35c..02f7d6e4 100644 --- a/sfall/Modules/Interface.cpp +++ b/sfall/Modules/Interface.cpp @@ -644,11 +644,11 @@ static void InterfaceWindowPatch() { SafeWriteBytes(0x470971, code, 11); // calculates the offset in the pixel array for x/y coordinates // Increase the max text width of the player name on the character screen - const DWORD printBignameAddr[] = {0x435160, 0x435189}; // 100 + const DWORD printBignameAddr[] = {0x435160, 0x435189}; // 100 (PrintBigname_) SafeWriteBatch(127, printBignameAddr); // Increase the max text width of the information card on the character screen - const DWORD drawCardAddr[] = {0x43ACD5, 0x43DD37}; // 136, 133 + const DWORD drawCardAddr[] = {0x43ACD5, 0x43DD37}; // 136, 133 (DrawCard_, DrawCard2_) SafeWriteBatch(145, drawCardAddr); // Increase the width of the mouse drop area from 64px to 80px for the PC's and NPC's inventory on the barter screen