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

Fixed elevation check in get/set_can_rest_on_map

Browse Source 
Changed DebugMode to not require enabling sfall debugging mode.
Changed version to 4.1.9.1 as maintenance release.
This commit is contained in:
NovaRain
2019-07-17 10:02:20 +08:00
parent 16fbc0f93f
commit 01bbd111d3
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+6 -4
View File
@@ -1,5 +1,5 @@
;sfall configuration settings ;sfall configuration settings
;v4.2 ;v4.1.9.1
[Main] [Main]
;Change to 1 if you want to use command line args to tell sfall to use another ini file. ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -186,7 +186,7 @@ FastMoveFromContainer=0
;A key to press to open a debug game editor ;A key to press to open a debug game editor
;Set to 0 to disable, or a DX scancode otherwise ;Set to 0 to disable, or a DX scancode otherwise
;Requires sfall debugging mode and FalloutClient.exe from the modders pack ;Requires sfall debugging mode to be enabled and FalloutClient.exe from the modders pack
DebugEditorKey=0 DebugEditorKey=0
;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -727,6 +727,7 @@ Enable=0
;Fallout 2 Debug Patch ;Fallout 2 Debug Patch
;Set to 1 to send debug output to the screen, 2 to a debug.log file, or 3 to both the screen and a debug.log file ;Set to 1 to send debug output to the screen, 2 to a debug.log file, or 3 to both the screen and a debug.log file
;Does not require enabling sfall debugging mode
;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg: ;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg:
;------- ;-------
;[debug] ;[debug]
@@ -745,12 +746,12 @@ DebugMode=0
SkipCompatModeCheck=0 SkipCompatModeCheck=0
;Set to 1 to skip the executable file size check ;Set to 1 to skip the executable file size check
;Does not require sfall debugging mode ;Does not require enabling sfall debugging mode
SkipSizeCheck=0 SkipSizeCheck=0
;If you're testing changes to the Fallout exe, you can override the CRC that sfall looks for here ;If you're testing changes to the Fallout exe, you can override the CRC that sfall looks for here
;You can use several hex values, separated by commas ;You can use several hex values, separated by commas
;Does not require sfall debugging mode ;Does not require enabling sfall debugging mode
;ExtraCRC=0x00000000,0x00000000 ;ExtraCRC=0x00000000,0x00000000
;Set to 1 to stop Fallout from deleting non read-only protos at startup ;Set to 1 to stop Fallout from deleting non read-only protos at startup
@@ -767,6 +768,7 @@ AlwaysFindScripts=0
InjectAllGameHooks=0 InjectAllGameHooks=0
;Set to 1 to hide error messages in debug output when a null value is passed to the function as an object ;Set to 1 to hide error messages in debug output when a null value is passed to the function as an object
;Does not require enabling sfall debugging mode
HideObjIsNullMsg=0 HideObjIsNullMsg=0
;Set to 1 to force critters to display combat float messages ;Set to 1 to force critters to display combat float messages
sfall/Modules/DebugEditor.cpp
+2 -1
View File
@@ -358,8 +358,9 @@ void DontDeleteProtosPatch() {
} }
void DebugEditor::init() { void DebugEditor::init() {
if (!isDebug) return;
DebugModePatch(); DebugModePatch();
if (!isDebug) return;
DontDeleteProtosPatch(); DontDeleteProtosPatch();
debugEditorKey = GetConfigInt("Input", "DebugEditorKey", 0); debugEditorKey = GetConfigInt("Input", "DebugEditorKey", 0);
sfall/Modules/Scripting/Handlers/Worldmap.cpp
+2 -2
View File
@@ -266,7 +266,7 @@ void sf_set_rest_on_map(OpcodeContext& ctx) {
return; return;
} }
long elev = ctx.arg(1).asInt(); long elev = ctx.arg(1).asInt();
if (elev < -1 && elev > 2) { if (elev < -1 || elev > 2) {
ctx.printOpcodeError("%s() - invalid map elevation argument.", ctx.getMetaruleName()); ctx.printOpcodeError("%s() - invalid map elevation argument.", ctx.getMetaruleName());
} else { } else {
Worldmap::SetRestMapLevel(mapId, elev, ctx.arg(2).asBool()); Worldmap::SetRestMapLevel(mapId, elev, ctx.arg(2).asBool());
@@ -275,7 +275,7 @@ void sf_set_rest_on_map(OpcodeContext& ctx) {
void sf_get_rest_on_map(OpcodeContext& ctx) { void sf_get_rest_on_map(OpcodeContext& ctx) {
long elev = ctx.arg(1).asInt(); long elev = ctx.arg(1).asInt();
if (elev < 0 && elev > 2) { if (elev < 0 || elev > 2) {
ctx.printOpcodeError("%s() - invalid map elevation argument.", ctx.getMetaruleName()); ctx.printOpcodeError("%s() - invalid map elevation argument.", ctx.getMetaruleName());
} else { } else {
ctx.setReturn(Worldmap::GetRestMapLevel(elev, ctx.arg(0).asInt())); ctx.setReturn(Worldmap::GetRestMapLevel(elev, ctx.arg(0).asInt()));
sfall/version.h
+4 -5
View File
@@ -23,11 +23,10 @@
#define LEGAL_COPYRIGHT "Copyright (C) 2006-2019, sfall team" #define LEGAL_COPYRIGHT "Copyright (C) 2006-2019, sfall team"
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 2 #define VERSION_MINOR 1
#define VERSION_BUILD 0 #define VERSION_BUILD 9
#define VERSION_REV 0 #define VERSION_REV 1
#define VERSION_STRING "4.2" #define VERSION_STRING "4.1.9.1"
//#define CHECK_VAL (4) //#define CHECK_VAL (4)