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

Added HideObjIsNullMsg option to [Debugging].

Browse Source 
Moved DebugEditor option from MiscPatches.cpp to DebugEditor.cpp.
This commit is contained in:
NovaRain
2019-01-27 10:39:59 +08:00
parent 3eba5c3054
commit 0e91aed2e2
5 changed files with 86 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+3
View File
@@ -720,6 +720,9 @@ AlwaysFindScripts=0
;Set to 1 to force sfall to inject all hooks code into the game, even if corresponding hook scripts don't exist
InjectAllGameHooks=0
;Set to 1 to hide error messages in the debug.log file when a null value is passed to the function as an object
HideObjIsNullMsg=0
;These options control what output is saved in the debug log (sfall-log.txt)
;Prints messages duing sfall initialization
sfall/Modules/DebugEditor.cpp
+66 -7
View File
@@ -43,6 +43,11 @@ namespace sfall
#define CODE_GET_ARRAY (9)
#define CODE_SET_ARRAY (10)
static const char* debugLog = "LOG";
static const char* debugGnw = "GNW";
static DWORD debugEditorKey = 0;
static bool SetBlocking(SOCKET s, bool block) {
DWORD d = !block;
ioctlsocket(s, FIONBIO, &d);
@@ -149,7 +154,7 @@ static void RunEditorInternal(SOCKET &s) {
sglobals[id].val = val;
break;
case 9:
{
{
InternalRecv(s, &id, 4);
DWORD *types = new DWORD[arrays[id * 3 + 1]];
char *data = new char[arrays[id * 3 + 1] * arrays[id * 3 + 2]];
@@ -158,17 +163,17 @@ static void RunEditorInternal(SOCKET &s) {
InternalSend(s, data, arrays[id * 3 + 1] * arrays[id * 3 + 2]);
delete[] data;
delete[] types;
}
break;
}
break;
case 10:
{
{
InternalRecv(s, &id, 4);
char *data = new char[arrays[id * 3 + 1] * arrays[id * 3 + 2]];
InternalRecv(s, data, arrays[id * 3 + 1] * arrays[id * 3 + 2]);
script::DESetArray(arrays[id * 3], 0, data);
delete[] data;
}
break;
}
break;
}
}
@@ -238,10 +243,60 @@ void RunDebugEditor() {
WSACleanup();
}
static DWORD debugEditorKey = 0;
static void __declspec(naked) dbg_error_hack() {
__asm {
cmp ebx, 1;
je hide;
sub esp, 0x104;
retn;
hide:
add esp, 4; // destroy this return addr
pop esi;
pop ecx;
retn;
}
}
static void __declspec(naked) win_debug_hook() {
__asm {
call fo::funcoffs::debug_log_;
xor eax, eax;
cmp ds:[FO_VAR_GNW_win_init_flag], eax;
retn;
}
}
void DebugModePatch() {
DWORD dbgMode = GetPrivateProfileIntA("Debugging", "DebugMode", 0, ::sfall::ddrawIni);
if (dbgMode) {
dlog("Applying debugmode patch.", DL_INIT);
//If the player is using an exe with the debug patch already applied, just skip this block without erroring
if (*((DWORD*)0x444A64) != 0x082327E8) {
SafeWrite32(0x444A64, 0x082327E8); // call debug_register_env_
SafeWrite32(0x444A68, 0x0120E900); // jmp 0x444B8E
SafeWrite8(0x444A6D, 0);
SafeWrite32(0x444A6E, 0x90909090);
}
SafeWrite8(0x4C6D9B, 0xB8); // mov eax, GNW/LOG
if (dbgMode & 2) {
SafeWrite32(0x4C6D9C, (DWORD)debugLog);
if (dbgMode & 1) {
SafeWrite16(0x4C6E75, 0x66EB); // jmps 0x4C6EDD
SafeWrite8(0x4C6EF2, 0xEB);
SafeWrite8(0x4C7034, 0x0);
MakeCall(0x4DC319, win_debug_hook, 2);
}
} else {
SafeWrite32(0x4C6D9C, (DWORD)debugGnw);
}
dlogr(" Done", DL_INIT);
}
}
void DebugEditor::init() {
if (!isDebug) return;
DebugModePatch();
debugEditorKey = GetConfigInt("Input", "DebugEditorKey", 0);
if (debugEditorKey != 0) {
OnKeyPressed() += [](DWORD scanCode, bool pressed) {
@@ -250,6 +305,10 @@ void DebugEditor::init() {
}
};
}
if (GetPrivateProfileIntA("Debugging", "HideObjIsNullMsg", 0, ::sfall::ddrawIni)) {
MakeCall(0x453FD2, dbg_error_hack, 1);
}
}
}
sfall/Modules/MiscPatches.cpp
+15 -57
View File
@@ -37,9 +37,6 @@ static char configName[65];
static char patchName[65];
static char versionString[65];
static const char* debugLog = "LOG";
static const char* debugGnw = "GNW";
static int* scriptDialog = nullptr;
bool npcAutoLevelEnabled;
@@ -468,44 +465,6 @@ static const DWORD EncounterTableSize[] = {
0x4C0815, 0x4C0D4A, 0x4C0FD4,
};
static void __declspec(naked) win_debug_hook() {
__asm {
call fo::funcoffs::debug_log_;
xor eax, eax;
cmp ds:[FO_VAR_GNW_win_init_flag], eax;
retn;
}
}
void DebugModePatch() {
if (isDebug) {
DWORD dbgMode = GetPrivateProfileIntA("Debugging", "DebugMode", 0, ::sfall::ddrawIni);
if (dbgMode) {
dlog("Applying debugmode patch.", DL_INIT);
//If the player is using an exe with the debug patch already applied, just skip this block without erroring
if (*((DWORD*)0x444A64) != 0x082327E8) {
SafeWrite32(0x444A64, 0x082327E8); // call debug_register_env_
SafeWrite32(0x444A68, 0x0120E900); // jmp 0x444B8E
SafeWrite8(0x444A6D, 0);
SafeWrite32(0x444A6E, 0x90909090);
}
SafeWrite8(0x4C6D9B, 0xB8); // mov eax, GNW/LOG
if (dbgMode & 2) {
SafeWrite32(0x4C6D9C, (DWORD)debugLog);
if (dbgMode & 1) {
SafeWrite16(0x4C6E75, 0x66EB); // jmps 0x4C6EDD
SafeWrite8(0x4C6EF2, 0xEB);
SafeWrite8(0x4C7034, 0x0);
MakeCall(0x4DC319, win_debug_hook, 2);
}
} else {
SafeWrite32(0x4C6D9C, (DWORD)debugGnw);
}
dlogr(" Done", DL_INIT);
}
}
}
void NpcAutoLevelPatch() {
npcAutoLevelEnabled = GetConfigInt("Misc", "NPCAutoLevel", 0) != 0;
if (npcAutoLevelEnabled) {
@@ -513,21 +472,6 @@ void NpcAutoLevelPatch() {
SafeWrite8(0x495CFB, 0xEB); // jmps 0x495D28 (skip random check)
dlogr(" Done", DL_INIT);
}
if (GetConfigInt("Misc", "SingleCore", 1)) {
dlog("Applying single core patch.", DL_INIT);
HANDLE process = GetCurrentProcess();
SetProcessAffinityMask(process, 1);
CloseHandle(process);
dlogr(" Done", DL_INIT);
}
if (GetConfigInt("Misc", "OverrideArtCacheSize", 0)) {
dlog("Applying override art cache size patch.", DL_INIT);
SafeWrite8(0x41886A, 0x0);
SafeWrite32(0x418872, 256);
dlogr(" Done", DL_INIT);
}
}
void AdditionalWeaponAnimsPatch() {
@@ -968,10 +912,24 @@ void MiscPatches::init() {
dlogr(" Done", DL_INIT);
}
if (GetConfigInt("Misc", "SingleCore", 1)) {
dlog("Applying single core patch.", DL_INIT);
HANDLE process = GetCurrentProcess();
SetProcessAffinityMask(process, 1);
CloseHandle(process);
dlogr(" Done", DL_INIT);
}
if (GetConfigInt("Misc", "OverrideArtCacheSize", 0)) {
dlog("Applying override art cache size patch.", DL_INIT);
SafeWrite8(0x41886A, 0x0);
SafeWrite32(0x418872, 256);
dlogr(" Done", DL_INIT);
}
LoadGameHook::OnBeforeGameStart() += BodypartHitChances; // set on start & load
CombatProcFix();
DebugModePatch();
NpcAutoLevelPatch();
DialogueFix();
DontDeleteProtosPatch();
sfall/ddraw.vcxproj
+1
View File
@@ -138,6 +138,7 @@
<AssemblerListingLocation>$(IntDir)/%(RelativeDir)/</AssemblerListingLocation>
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
<ForcedIncludeFiles>stdafx.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<FunctionLevelLinking>true</FunctionLevelLinking>
</ClCompile>
<Link>
<AdditionalDependencies>kernel32.lib;user32.lib;d3d9.lib;d3dx9.lib;Strmiids.lib;dinput.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
sfall/main.cpp
+1 -1
View File
@@ -168,7 +168,6 @@ static void InitModules() {
manager.add<Explosions>();
manager.add<Message>();
manager.add<Elevators>();
manager.add<DebugEditor>();
manager.add<KillCounter>();
manager.add<AI>();
@@ -177,6 +176,7 @@ static void InitModules() {
manager.add<BarBoxes>();
manager.add<HeroAppearance>();
manager.add<MiscPatches>();
manager.add<DebugEditor>();
manager.initAll();