Fixed AutoQuickSavePage option, now set value to -1 is used for saving in current(active) page.

Scripts functions read_byte/short/int/string no longer require the AllowUnsafeScripting option.

Author: FakelsHub

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v4.1.2 - Extended version
+;v4.1.3 - Extended version
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -408,10 +408,11 @@ ExtraSaveSlots=1
 
 ;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand, set the next two lines
 ;AutoQuickSave sets how many save slots on a page you want to use for quick saving (valid range: 1..10)
+;AutoQuickSavePage is the page number to use auto save (valid range: 0..999, if ExtraSaveSlots is enabled)
 ;Quick save will cyclically overwrite the save from the first slot of the page to the slot specified in the parameter
-;Set to 0 to disable.
+;Set to 0 to disable
 AutoQuickSave=0
-;AutoQuickSavePage is the page number to use (valid range: 0..999) if ExtraSaveSlots is enabled
+;Set to -1, to use active selected page
 AutoQuickSavePage=1
 
 ;Set to 1 to speed up the HP/AC counter animations
@@ -588,8 +589,8 @@ DialogOptions9Lines=1
 ;Set to 1 to leave the music playing in dialogue with talking heads
 EnableMusicInDialogue=0
 
-;Set to 1 to prevent the player from running while sneaking without Silent Running perk
-DontTurnOffSneakIfYouRun=0
+;Set to 1 so that the sneak mode does not turn off when the "Run Always" option is set, without need to hold the Shift key
+DontTurnOffSneakIfYouRun=1
 
 ;Set to 1 to fix the bug that unable to sell used geiger counters or stealth boys
 CanSellUsedGeiger=1
@@ -649,7 +650,7 @@ AIDrugUsePerfFix=0
 
 ;Set to 1 to disables loading of all configuration settings of the game from the saved game, except the difficulty settings
 ;Set to 2 also disables load the game/combat difficulty settings
-SkipLoadingGameSetting=0
+SkipLoadingGameSetting=1
 
 ;Set to 1 to displays the electric stats of the armor in the player's inventory
 ;Set to 2 will replace the name of the player's character in the inventory by the health points
@@ -739,18 +740,20 @@ SkipSizeCheck=0
 
 ;Set to 1 to stop Fallout from deleting non readonly protos at startup
 ;Has pretty nasty side effects when saving/reloading, so don't use for regular gameplay
+;It is not recommended to set for regular game
 DontDeleteProtos=0
 
 ;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
 ;Does not require sfall debugging mode
 AllowUnsafeScripting=0
 
 ;Set to 1 to force sfall to inject all hooks code into the game, even if corresponding hook scripts don't exist
+;It is not recommended to set for regular game
 InjectAllGameHooks=0
 
 ;These options control what output is saved in the debug log (sfall-log.txt)
 ;Prints messages duing sfall initialization
-Init=0
+Init=1
 ;Prints messages relating to hook scripts
 Hook=0
 ;Prints messages relating to scripting

artifacts/scripting/sfall opcode list.txt

@@ -1,8 +1,10 @@
 
-*0x8156 - int   read_byte(int address)
-*0x8157 - int   read_short(int address)
-*0x8158 - int   read_int(int address)
-*0x8159 - string read_string(int address)
+* These functions require AllowUnsafeScripting to be enabled in ddraw.ini
+
+0x8156 - int   read_byte(int address)
+0x8157 - int   read_short(int address)
+0x8158 - int   read_int(int address)
+0x8159 - string read_string(int address)
 
 *0x81cf - void  write_byte(int address, int value)
 *0x81d0 - void  write_short(int address, int value)
@@ -356,7 +358,3 @@
 0x827a - any sfall_func4(string funcName, arg1, arg2, arg3, arg4)
 0x827b - any sfall_func5(string funcName, arg1, arg2, arg3, arg4, arg5)
 0x827c - any sfall_func6(string funcName, arg1, arg2, arg3, arg4, arg5, arg6)
-
-
-* These functions require AllowUnsafeScripting to be enabled in ddraw.ini
-

sfall/Modules/ExtraSaveSlots.cpp

@@ -440,9 +440,10 @@ static void CreateSaveComment(char* bufstr) {
 	strcpy(bufstr, buf);
 }
 
-static DWORD quickSavePage = 0, autoQuickSave = 0;
-
+static DWORD autoQuickSave = 0;
+static long quickSavePage = 0;
 static FILETIME ftPrevSlot;
+
 static DWORD __stdcall QuickSaveGame(fo::DbFile* file, char* filename) {
 
 	unsigned int currSlot = fo::var::slot_cursor;
@@ -513,9 +514,9 @@ void ExtraSaveSlots::init() {
 
 		quickSavePage = GetConfigInt("Misc", "AutoQuickSavePage", 0);
 		if (quickSavePage > 999) quickSavePage = 999;
-		quickSavePage *= 10;
 
-		if (extraSaveSlots && quickSavePage > 0) {
+		if (extraSaveSlots && quickSavePage > -1) {
+			quickSavePage *= 10;
 			MakeCall(0x47B923, SaveGame_hack1, 1);
 		} else {
 			SafeWrite8(0x47B923, 0x89);

sfall/Modules/Scripting/Opcodes.cpp

@@ -209,10 +209,6 @@ void InitNewOpcodes() {
 
 	if (GetPrivateProfileIntA("Debugging", "AllowUnsafeScripting", 0, ::sfall::ddrawIni)) {
 		dlogr("  Unsafe opcodes enabled.", DL_SCRIPT);
-		opcodes[0x156] = op_read_byte;
-		opcodes[0x157] = op_read_short;
-		opcodes[0x158] = op_read_int;
-		opcodes[0x159] = op_read_string;
 		opcodes[0x1cf] = op_write_byte;
 		opcodes[0x1d0] = op_write_short;
 		opcodes[0x1d1] = op_write_int;
@@ -223,6 +219,10 @@ void InitNewOpcodes() {
 	} else {
 		dlogr("  Unsafe opcodes disabled.", DL_SCRIPT);
 	}
+	opcodes[0x156] = op_read_byte;
+	opcodes[0x157] = op_read_short;
+	opcodes[0x158] = op_read_int;
+	opcodes[0x159] = op_read_string;
 
 	opcodes[0x15a] = op_set_pc_base_stat;
 	opcodes[0x15b] = op_set_pc_extra_stat;