eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge b2dafc1e29 into f411d75643

This commit is contained in:
sonilyan 2023-11-09 21:32:51 +07:00 committed by GitHub
parent f411d75643 b2dafc1e29
commit f1e9ce8066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pipboy.cc
View File

@ -33,6 +33,7 @@
#include "random.h"
#include "scripts.h"
#include "settings.h"
#include "sfall_config.h"
#include "stat.h"
#include "svga.h"
#include "text_font.h"
@ -394,12 +395,14 @@ unsigned char _stat_flag;
static int gPipboyPrevTab;
bool PipBoyAvailableAtGameStart = false;
static FrmImage _pipboyFrmImages[PIPBOY_FRM_COUNT];
// 0x497004
int pipboyOpen(int intent)
{
if (!wmMapPipboyActive()) {
if (!wmMapPipboyActive() && !PipBoyAvailableAtGameStart) {
// You aren't wearing the pipboy!
const char* text = getmsg(&gMiscMessageList, &gPipboyMessageListItem, 7000);
showDialogBox(text, NULL, 0, 192, 135, _colorTable[32328], NULL, _colorTable[32328], 1);
@ -741,6 +744,9 @@ static void pipboyWindowFree()
// 0x497918
static void _pip_init_()
{
int configValue = 2;
configGetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_PIPBOY_AVAILABLE_AT_GAMESTART, &configValue);
PipBoyAvailableAtGameStart = configValue == 1;
}
// NOTE: Uncollapsed 0x497918.

2
src/sfall_config.cc
View File

@ -62,6 +62,8 @@ bool sfallConfigInit(int argc, char** argv)
configSetString(&gSfallConfig, SFALL_CONFIG_SCRIPTS_KEY, SFALL_CONFIG_INI_CONFIG_FOLDER, "");
configSetString(&gSfallConfig, SFALL_CONFIG_SCRIPTS_KEY, SFALL_CONFIG_GLOBAL_SCRIPT_PATHS, "");
configSetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_PIPBOY_AVAILABLE_AT_GAMESTART, 2);
char path[COMPAT_MAX_PATH];
char* executable = argv[0];
char* ch = strrchr(executable, '\\');

1
src/sfall_config.h
View File

@ -72,6 +72,7 @@ namespace fallout {
#define SFALL_CONFIG_INI_CONFIG_FOLDER "IniConfigFolder"
#define SFALL_CONFIG_GLOBAL_SCRIPT_PATHS "GlobalScriptPaths"
#define SFALL_CONFIG_AUTO_QUICK_SAVE "AutoQuickSave"
#define SFALL_CONFIG_PIPBOY_AVAILABLE_AT_GAMESTART "PipBoyAvailableAtGameStart"
#define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_MULTIPLIER 1
#define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_DIVISOR 3