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

Set idle(Sleep) function for losing window focus

Browse Source 
Some code correction.
This commit is contained in:
NovaRain
2021-05-06 10:43:40 +08:00
parent 273f2b8e97
commit b2c2a70822
7 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+2 -2
View File
@@ -415,7 +415,7 @@ CorpseDeleteTime=6
;Set a number of milliseconds to idle each input loop
;Set to -1 to disable
;Set to 0 to idle only if other processes are waiting for processor time (WinXP/2000: if processes have equal priority)
;Set to 1 (or some higher number if needed) to prevent 100% CPU use. The maximum is 127
;Set to 1 (or some higher number if needed) to prevent 100% CPU use. The maximum is 100
ProcessorIdle=-1
;Set to 1 if using the hero appearance mod
@@ -594,7 +594,7 @@ ObjCanSeeObj_ShootThru_Fix=0
;Set to 1 to fix the broken obj_can_hear_obj script function
ObjCanHearObjFix=0
;Set to 1 to enable the mood argument of start_gdialog script function for talking heads
;Set to 1 to enable the 'mood' argument of start_gdialog script function for talking heads
;If the argument value is -1, the mood will be determined by the local variable 0 of the script (vanilla behavior)
StartGDialogFix=0
sfall/BugFixes.cpp
+14 -12
View File
@@ -2318,10 +2318,12 @@ skip:
static void __declspec(naked) exec_script_proc_hack() {
__asm {
mov eax, [esi + 0x58];
test edi, edi; // loading?
jnz end;
mov eax, [esi + 0x58]; // script.procedure_table.start
test eax, eax;
ja end;
inc eax; // start proc
ja end; // != 0
dec eax; // is bad - set to -1 for skipping execution
end:
retn;
}
@@ -2329,10 +2331,10 @@ end:
static void __declspec(naked) exec_script_proc_hack1() {
__asm {
mov esi, [edi + 0x58];
mov esi, [edi + 0x58]; // script.procedure_table.start
test esi, esi;
ja end;
inc esi; // start proc
ja end; // != 0
inc esi; // 1 - default position
end:
retn;
}
@@ -3473,13 +3475,13 @@ void BugFixes_Init()
// Fix for the incorrect item being checked for the presence of weapon perks
HookCall(0x42954B, ai_best_weapon_hook);
// Corrects the calculation of the weapon score to: (maxDmg + minDmg) / 4
DWORD aiBestWeaponAddr[2] = {0x4294E2, 0x429675};
SafeWriteBatch<BYTE>(0x01, aiBestWeaponAddr); // sub > add
aiBestWeaponAddr[0] = 0x4294E6; aiBestWeaponAddr[1] = 0x429679;
MakeCalls(ai_best_weapon_hack, aiBestWeaponAddr);
const DWORD aiBestWeaponAddr1[] = {0x4294E2, 0x429675};
SafeWriteBatch<BYTE>(0x01, aiBestWeaponAddr1); // sub > add
const DWORD aiBestWeaponAddr2[] = {0x4294E6, 0x429679};
MakeCalls(ai_best_weapon_hack, aiBestWeaponAddr2);
// Corrects the weapon score multiplier for having perks to 2x (was 5x)
aiBestWeaponAddr[0] = 0x42955E; aiBestWeaponAddr[1] = 0x4296E7;
SafeWriteBatch<BYTE>(0x15, aiBestWeaponAddr); // lea eax, [edx*4] > lea eax, [edx]
const DWORD aiBestWeaponAddr3[] = {0x42955E, 0x4296E7};
SafeWriteBatch<BYTE>(0x15, aiBestWeaponAddr3); // lea eax, [edx*4] > lea eax, [edx]
dlogr(" Done", DL_FIX);
}
sfall/FalloutFuncs_def.h
+1 -1
View File
@@ -83,7 +83,7 @@ WRAP_WATCOM_FUNC1(long, critterIsOverloaded, TGameObj*, critter)
WRAP_WATCOM_FUNC1(void, display_print, const char*, msg) // Displays message in main UI console window
WRAP_WATCOM_FUNC0(void, display_stats)
// Execute script proc by internal proc number (from script's proc table, basically a sequential number of a procedure as defined in code, starting from 1)
WRAP_WATCOM_FUNC2(void, executeProcedure, TProgram*, sptr, long, procNum)
WRAP_WATCOM_FUNC2(void, executeProcedure, TProgram*, sptr, long, procPosition)
WRAP_WATCOM_FUNC1(long, folder_print_line, const char*, text)
WRAP_WATCOM_FUNC1(const char*, findCurrentProc, TProgram*, program) // Returns the name of current procedure by program pointer
WRAP_WATCOM_FUNC1(long, FMtext_width, const char*, text)
sfall/FalloutStructs.h
+7 -14
View File
@@ -263,7 +263,7 @@ struct TProgram {
long *codeStackPtr;
long field_8;
long field_C;
long *codePtr;
long codePosition; // position in the code stack when reading script opcodes
long field_14; // unused?
long field_18; // unused?
long *dStackPtr;
@@ -273,24 +273,17 @@ struct TProgram {
long field_2C;
long *stringRefPtr;
long *procTablePtr;
long field_38; // same as codeStackPtr
long *codeStack; // same as codeStackPtr
long savedEnv[12]; // saved register values
long field_6C; // unused?
long field_70; // unused?
long field_74; // unused?
long field_78;
long field_7C;
union {
long flags;
struct {
char flags1;
char flags2;
char flags3;
char flags4;
};
};
long timerTick; // unused?
long func_7C; // always null?
short flags;
short fetchOpcode;
long currentScriptWin; // current window for executing script
long field_88;
long shouldRemove;
};
static_assert(sizeof(TProgram) == 140, "Incorrect TProgram definition.");
sfall/HookScripts.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ static const int numHooks = HOOK_COUNT;
// Struct for registered hook script
struct sHookScript {
sScriptProgram prog;
int callback; // proc number in script's proc table
int callback; // procedure position in script's proc table
bool isGlobalScript; // false for hs_* scripts, true for gl* scripts
};
sfall/MiscPatches.cpp
+4
View File
@@ -758,6 +758,10 @@ void MiscPatches_Init() {
dlogr(" Done", DL_INIT);
}
// Set idle function
*ptr_idle_func = reinterpret_cast<void*>(Sleep);
SafeWrite16(0x4C9F12, 0x7D6A); // push 125 (ms)
BlockCall(0x4425E6); // Patch out ereg call
SafeWrite8(0x4810AB, CODETYPE_JumpShort); // Disable selfrun
sfall/ScriptExtender.cpp
+11 -16
View File
@@ -1177,27 +1177,27 @@ static void ClearGlobalScripts() {
void RunScriptProc(sScriptProgram* prog, const char* procName) {
TProgram* sptr = prog->ptr;
int procNum = fo_interpretFindProcedure(sptr, procName);
if (procNum != -1) {
fo_executeProcedure(sptr, procNum);
int procPosition = fo_interpretFindProcedure(sptr, procName);
if (procPosition != -1) {
fo_executeProcedure(sptr, procPosition);
}
}
void RunScriptProc(sScriptProgram* prog, long procId) {
if (procId > 0 && procId < Scripts::count) {
int procNum = prog->procLookup[procId];
if (procNum != -1) {
fo_executeProcedure(prog->ptr, procNum);
int procPosition = prog->procLookup[procId];
if (procPosition != -1) {
fo_executeProcedure(prog->ptr, procPosition);
}
}
}
int RunScriptStartProc(sScriptProgram* prog) {
int procNum = prog->procLookup[Scripts::start];
if (procNum != -1) {
fo_executeProcedure(prog->ptr, procNum);
int procPosition = prog->procLookup[Scripts::start];
if (procPosition != -1) {
fo_executeProcedure(prog->ptr, procPosition);
}
return procNum;
return procPosition;
}
static void RunScript(sGlobalScript* script) {
@@ -1532,12 +1532,7 @@ void ScriptExtender_Init() {
}
idle = GetConfigInt("Misc", "ProcessorIdle", -1);
if (idle > -1) {
if (idle > 127) idle = 127;
*ptr_idle_func = reinterpret_cast<void*>(Sleep);
SafeWrite8(0x4C9F12, 0x6A); // push idle
SafeWrite8(0x4C9F13, idle);
}
if (idle > -1 && idle > 100) idle = 100;
arraysBehavior = GetConfigInt("Misc", "arraysBehavior", 1);
if (arraysBehavior > 0) {