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

Edited the msg for SkipLoadingGameSettings a bit

Browse Source 
Added a few more defines.
This commit is contained in:
NovaRain
2020-05-08 10:44:37 +08:00
parent b25ca683f3
commit c7ccb7f2c2
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+1 -1
View File
@@ -715,7 +715,7 @@ PartyMemberExtraInfo=0
;that overrides First Aid/Doctor functions has very limited usefulness ;that overrides First Aid/Doctor functions has very limited usefulness
PartyMemberSkillFix=0 PartyMemberSkillFix=0
;Set to 1 to skip loading all game settings except the game/combat difficulty from a saved game ;Set to 1 to skip loading all game settings except the game/combat difficulty from saved games
;Set to 2 to also skip loading the game/combat difficulty settings ;Set to 2 to also skip loading the game/combat difficulty settings
SkipLoadingGameSettings=0 SkipLoadingGameSettings=0
sfall/FalloutEngine/Functions_def.h
+1
View File
@@ -91,6 +91,7 @@ WRAP_WATCOM_FUNC0(long, is_pc_sneak_working)
WRAP_WATCOM_FUNC2(long, is_within_perception, GameObject*, source, GameObject*, target) WRAP_WATCOM_FUNC2(long, is_within_perception, GameObject*, source, GameObject*, target)
WRAP_WATCOM_FUNC1(long, item_c_curr_size, GameObject*, critter) WRAP_WATCOM_FUNC1(long, item_c_curr_size, GameObject*, critter)
WRAP_WATCOM_FUNC1(long, item_caps_total, GameObject*, object) WRAP_WATCOM_FUNC1(long, item_caps_total, GameObject*, object)
WRAP_WATCOM_FUNC2(GameObject*, item_hit_with, GameObject*, critter, long, hitMode)
WRAP_WATCOM_FUNC1(long, item_size, GameObject*, item) WRAP_WATCOM_FUNC1(long, item_size, GameObject*, item)
WRAP_WATCOM_FUNC1(long, item_total_cost, GameObject*, object) WRAP_WATCOM_FUNC1(long, item_total_cost, GameObject*, object)
WRAP_WATCOM_FUNC1(long, item_total_weight, GameObject*, object) WRAP_WATCOM_FUNC1(long, item_total_weight, GameObject*, object)
sfall/FalloutEngine/VariableOffsets.h
+3 -1
View File
@@ -277,6 +277,8 @@
#define FO_VAR_DARK_GREY_Color 0x6A59D8 #define FO_VAR_DARK_GREY_Color 0x6A59D8
#define FO_VAR_DarkGreenColor 0x6A3A90 #define FO_VAR_DarkGreenColor 0x6A3A90
#define FO_VAR_DarkGreenGreyColor 0x6A3DF1 #define FO_VAR_DarkGreenGreyColor 0x6A3DF1
#define FO_VAR_DarkRedColor 0x6AA8D0
#define FO_VAR_DarkYellowColor 0x6AB472
#define FO_VAR_DullPinkColor 0x6AB718 #define FO_VAR_DullPinkColor 0x6AB718
#define FO_VAR_GoodColor 0x6AB4EF #define FO_VAR_GoodColor 0x6AB4EF
#define FO_VAR_GreenColor 0x6A3CB0 #define FO_VAR_GreenColor 0x6A3CB0
@@ -285,4 +287,4 @@
#define FO_VAR_PeanutButter 0x6A82F3 #define FO_VAR_PeanutButter 0x6A82F3
#define FO_VAR_RedColor 0x6AB4D0 #define FO_VAR_RedColor 0x6AB4D0
#define FO_VAR_WhiteColor 0x6AB8CF #define FO_VAR_WhiteColor 0x6AB8CF
#define FO_VAR_YellowColor 0x6AB8BB #define FO_VAR_YellowColor 0x6AB8BB // Light
sfall/Modules/MiscPatches.cpp
+7 -5
View File
@@ -560,16 +560,18 @@ static void PartyMemberSkillPatch() {
} }
static void SkipLoadingGameSettingsPatch() { static void SkipLoadingGameSettingsPatch() {
int skipLoading = GetConfigInt("Misc", "SkipLoadingGameSettings", 0); if (int skipLoading = GetConfigInt("Misc", "SkipLoadingGameSettings", 0)) {
if (skipLoading) { dlog("Applying skip loading game settings from saved games patch.", DL_INIT);
dlog("Applying skip loading game settings from a saved game patch.", DL_INIT);
BlockCall(0x493421); BlockCall(0x493421);
SafeWrite8(0x4935A8, 0x1F); SafeWrite8(0x4935A8, 0x1F);
SafeWrite32(0x4935AB, 0x90901B75); SafeWrite32(0x4935AB, 0x90901B75);
CodeData PatchData; CodeData PatchData;
if (skipLoading == 2) SafeWriteBatch<CodeData>(PatchData, {0x49341C, 0x49343B}); if (skipLoading == 2) SafeWriteBatch<CodeData>(PatchData, {0x49341C, 0x49343B});
SafeWriteBatch<CodeData>(PatchData, {0x493450, 0x493465, 0x49347A, 0x49348F, 0x4934A4, 0x4934B9, 0x4934CE, 0x4934E3, SafeWriteBatch<CodeData>(PatchData, {
0x4934F8, 0x49350D, 0x493522, 0x493547, 0x493558, 0x493569, 0x49357A}); 0x493450, 0x493465, 0x49347A, 0x49348F, 0x4934A4, 0x4934B9, 0x4934CE,
0x4934E3, 0x4934F8, 0x49350D, 0x493522, 0x493547, 0x493558, 0x493569,
0x49357A
});
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
} }