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

Backported AutoQuickSave and AutoQuickSavePage options from 4.x

Browse Source 
Updated version number and year.
This commit is contained in:
NovaRain
2019-12-28 09:27:45 +08:00
parent 11261ca9be
commit 0b5c61cb72
7 changed files with 160 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+9 -1
View File
@@ -1,5 +1,5 @@
;sfall configuration settings
;v3.8.22
;v3.8.23
[Main]
;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -445,6 +445,14 @@ UseScrollingQuestsList=1
;Set to 1 to add additional pages of save slots
ExtraSaveSlots=0
;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 (valid range: 1..1000) if ExtraSaveSlots is enabled
;The quick saves will be rotated from the first slot on the page to the n-th slot
;Set to 0 to disable. AutoQuickSave will use the current selected page if AutoQuickSavePage is disabled
AutoQuickSave=0
AutoQuickSavePage=0
;Set to 1 to speed up the HP/AC counter animations
;Set to 2 to update the HP/AC counters instantly
;Set to 3 to update the AC counter instantly when switching to other controlled critters in combat
sfall/Credits.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ static const char* ExtraLines[] = {
"#SFALL " VERSION_STRING,
"",
"sfall is free software, licensed under the GPL",
"Copyright 2008-2019 The sfall team",
"Copyright 2008-2020 The sfall team",
"",
"@Author",
"Timeslip",
sfall/ExtraSaveSlots.cpp
+118 -6
View File
@@ -16,10 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "main.h"
#include <stdio.h>
#include "main.h"
#include "FalloutEngine.h"
#include "ExtraSaveSlots.h"
#include "HeroAppearance.h"
@@ -91,6 +92,7 @@ static void __declspec(naked) load_page_offsets(void) {
//------------------------------------------
static void CreateButtons() {
DWORD winRef = *ptr_lsgwin;
// left button -10 | X | Y | W | H |HOn |HOff |BDown |BUp |PicUp |PicDown |? |ButType
WinRegisterButton(winRef, 100, 60, 24, 20, -1, 0x500, 0x54B, 0x14B, 0, 0, 0, 32);
// left button -100
@@ -259,11 +261,10 @@ CheckUp:
//------------------------------------------
void DrawPageText() {
DWORD winRef = *ptr_lsgwin; // load/save winref
if (winRef == 0) {
if (*ptr_lsgwin == 0) {
return;
}
WINinfo *SaveLoadWin = GetWinStruct(winRef);
WINinfo *SaveLoadWin = GetWinStruct(*ptr_lsgwin);
if (SaveLoadWin->surface == nullptr) {
return;
}
@@ -388,7 +389,7 @@ void EnableSuperSaving() {
// load saved page and list positions from file
MakeCall(0x47B82B, load_page_offsets);
// Add Load/Save page offset to Load/Save folder number/////////////////
// Add Load/Save page offset to Load/Save folder number
for (int i = 0; i < sizeof(AddPageOffset01Addrs) / 4; i++) {
MakeCall(AddPageOffset01Addrs[i], AddPageOffset01);
}
@@ -397,3 +398,114 @@ void EnableSuperSaving() {
MakeCall(0x47E756, AddPageOffset03);
}
static void GetSaveFileTime(char* filename, FILETIME* ftSlot) {
char fname[65];
sprintf_s(fname, "%s\\%s", *ptr_patches, filename);
HANDLE hFile = CreateFile(fname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile != INVALID_HANDLE_VALUE) {
GetFileTime(hFile, NULL, NULL, ftSlot);
CloseHandle(hFile);
} else {
ftSlot->dwHighDateTime = 0;
ftSlot->dwLowDateTime = 0;
};
}
static const char* commentFmt = "%02d/%02d/%d - %02d:%02d:%02d";
static void CreateSaveComment(char* bufstr) {
SYSTEMTIME stUTC, stLocal;
GetSystemTime(&stUTC);
SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal);
char buf[30];
sprintf_s(buf, commentFmt, stLocal.wDay, stLocal.wMonth, stLocal.wYear, stLocal.wHour, stLocal.wMinute, stLocal.wSecond);
strcpy(bufstr, buf);
}
static long autoQuickSave = 0;
static long quickSavePage = 0;
static FILETIME ftPrevSlot;
static DWORD __stdcall QuickSaveGame(DbFile* file, char* filename) {
long currSlot = *ptr_slot_cursor;
if (file) { // This slot is not empty
DbFClose(file);
FILETIME ftCurrSlot;
GetSaveFileTime(filename, &ftCurrSlot);
if (currSlot == 0 || ftCurrSlot.dwHighDateTime > ftPrevSlot.dwHighDateTime
|| (ftCurrSlot.dwHighDateTime == ftPrevSlot.dwHighDateTime && ftCurrSlot.dwLowDateTime > ftPrevSlot.dwLowDateTime)) {
ftPrevSlot.dwHighDateTime = ftCurrSlot.dwHighDateTime;
ftPrevSlot.dwLowDateTime = ftCurrSlot.dwLowDateTime;
if (++currSlot > autoQuickSave) {
currSlot = 0;
} else {
*ptr_slot_cursor = currSlot;
return 0x47B929; // check next slot
}
}
}
// Save to slot
*ptr_slot_cursor = currSlot;
LSData* saveData = (LSData*)_LSData;
CreateSaveComment(saveData[currSlot].comment);
*ptr_quick_done = 1;
return 0x47B9A4; // normal return
}
static void __declspec(naked) SaveGame_hack0() {
__asm {
mov ds:[_flptr], eax;
push ecx;
push edi;
push eax;
call QuickSaveGame;
pop ecx;
jmp eax;
}
}
static void __declspec(naked) SaveGame_hack1() {
__asm {
mov ds:[_slot_cursor], 0;
mov eax, quickSavePage;
mov LSPageOffset, eax;
retn;
}
}
void ExtraSaveSlotsInit() {
bool extraSaveSlots = (GetConfigInt("Misc", "ExtraSaveSlots", 0) != 0);
if (extraSaveSlots) {
dlog("Applying extra save slots patch.", DL_INIT);
EnableSuperSaving();
dlogr(" Done", DL_INIT);
}
autoQuickSave = GetConfigInt("Misc", "AutoQuickSave", 0);
if (autoQuickSave > 0) {
dlog("Applying auto quick save patch.", DL_INIT);
if (autoQuickSave > 10) autoQuickSave = 10;
autoQuickSave--; // reserved slot count
quickSavePage = GetConfigInt("Misc", "AutoQuickSavePage", 0);
if (quickSavePage > 1000) quickSavePage = 1000;
if (extraSaveSlots && quickSavePage > 0) {
quickSavePage = (quickSavePage - 1) * 10;
MakeCall(0x47B923, SaveGame_hack1, 1);
} else {
SafeWrite8(0x47B923, 0x89);
SafeWrite32(0x47B924, 0x5193B83D); // mov [slot_cursor], edi = 0
}
MakeJump(0x47B984, SaveGame_hack0);
dlogr(" Done", DL_INIT);
}
}
sfall/ExtraSaveSlots.h
+1 -1
View File
@@ -20,4 +20,4 @@
extern DWORD LSPageOffset;
void EnableSuperSaving();
void ExtraSaveSlotsInit();
sfall/FalloutStructs.h
+25
View File
@@ -273,6 +273,31 @@ struct sWindow {
};
#pragma pack(pop)
#pragma pack(push, 1)
struct LSData {
char signature[24];
short majorVer;
short minorVer;
char charR;
char playerName[32];
char comment[30];
char unused1;
short realMonth;
short realDay;
short realYear;
short unused2;
long realTime;
short gameMonth;
short gameDay;
short gameYear;
short unused3;
long gameTime;
short mapElev;
short mapNumber;
char mapName[16];
};
#pragma pack(pop)
#pragma pack(push, 1)
struct Queue {
DWORD time;
sfall/main.cpp
+2 -5
View File
@@ -418,11 +418,8 @@ static void DllMain2() {
dlogr("Running ConsoleInit().", DL_INIT);
ConsoleInit();
if (GetConfigInt("Misc", "ExtraSaveSlots", 0)) {
dlog("Applying extra save slots patch.", DL_INIT);
EnableSuperSaving();
dlogr(" Done", DL_INIT);
}
dlogr("Running ExtraSaveSlotsInit().", DL_INIT);
ExtraSaveSlotsInit();
dlogr("Running InventoryInit().", DL_INIT);
InventoryInit();
sfall/version.h
+4 -4
View File
@@ -20,15 +20,15 @@
#define TARGETVERSION "Fallout 2 v1.02 US"
#define LEGAL_COPYRIGHT "Copyright (C) 2006-2019, sfall team"
#define LEGAL_COPYRIGHT "Copyright (C) 2006-2020, sfall team"
#define VERSION_MAJOR 3
#define VERSION_MINOR 8
#define VERSION_BUILD 22
#define VERSION_BUILD 23
#define VERSION_REV 0
#ifdef WIN2K
#define VERSION_STRING "3.8.22 win2k"
#define VERSION_STRING "3.8.23 win2k"
#else
#define VERSION_STRING "3.8.22"
#define VERSION_STRING "3.8.23"
#endif