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

Changed critical table to be loaded before global scripts.

Browse Source 
Removed redundant ClearGlobals() in LoadGameHook.cpp (already run in ResetState(1) above)
Updated version number and year.
This commit is contained in:
NovaRain
2018-12-30 10:08:47 +08:00
parent 9b50e6be1e
commit 26ab38c6c3
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+1 -1
View File
@@ -1,5 +1,5 @@
;sfall configuration settings
;v3.8.13
;v3.8.14
[Main]
;Change to 1 if you want to use command line args to tell sfall to use another ini file.
sfall/LoadGameHook.cpp
+2 -3
View File
@@ -177,7 +177,6 @@ static void _stdcall LoadGame2_Before() {
dlog_f("Loading save game: %s\n", DL_MAIN, buf);
ClearGlobals();
HANDLE h = CreateFileA(buf, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
if (h != INVALID_HANDLE_VALUE) {
DWORD size, unused;
@@ -197,8 +196,8 @@ static void _stdcall LoadGame2_Before() {
}
static void _stdcall LoadGame2_After() {
LoadGlobalScripts();
CritLoad();
LoadGlobalScripts();
mapLoaded = true;
}
@@ -260,8 +259,8 @@ static void NewGame2() {
SetNewCharAppearanceGlobals();
LoadGlobalScripts();
CritLoad();
LoadGlobalScripts();
LoadHeroAppearance();
mapLoaded = true;
}
sfall/version.h
+4 -4
View File
@@ -20,17 +20,17 @@
#define TARGETVERSION "Fallout 2 v1.02 US"
#define LEGAL_COPYRIGHT "Copyright (C) 2006-2018, sfall team"
#define LEGAL_COPYRIGHT "Copyright (C) 2006-2019, sfall team"
#define VERSION_MAJOR 3
#define VERSION_MINOR 8
#define VERSION_BUILD 13
#define VERSION_BUILD 14
#define VERSION_REV 0
#ifdef WIN2K
#define VERSION_STRING "3.8.13 win2k"
#define VERSION_STRING "3.8.14 win2k"
#else
#define VERSION_STRING "3.8.13"
#define VERSION_STRING "3.8.14"
#endif
#define CHECK_VAL (4)