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

Add game dialog fix

This commit is contained in:
Alexander Batalov 2022-08-12 15:03:06 +03:00
parent 13b76287f8
commit 140234f40e
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game_dialog.cc
View File

@ -26,6 +26,7 @@
#include "proto.h" #include "proto.h"
#include "random.h" #include "random.h"
#include "scripts.h" #include "scripts.h"
#include "sfall_config.h"
#include "skill.h" #include "skill.h"
#include "stat.h" #include "stat.h"
#include "text_font.h" #include "text_font.h"
@ -670,10 +671,16 @@ static void gameDialogHighlightsExit();
static void gameDialogRedButtonsInit(); static void gameDialogRedButtonsInit();
static void gameDialogRedButtonsExit(); static void gameDialogRedButtonsExit();
static bool gGameDialogFix;
// gdialog_init // gdialog_init
// 0x444D1C // 0x444D1C
int gameDialogInit() int gameDialogInit()
{ {
// SFALL: Prevents from using 0 to escape from dialogue at any time.
gGameDialogFix = true;
configGetBool(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_GAME_DIALOG_FIX_KEY, &gGameDialogFix);
return 0; return 0;
} }
@ -1946,6 +1953,11 @@ int _gdProcess()
} else if (keyCode >= 1300 && keyCode <= 1330) { } else if (keyCode >= 1300 && keyCode <= 1330) {
gameDialogOptionOnMouseExit(keyCode - 1300); gameDialogOptionOnMouseExit(keyCode - 1300);
} else if (keyCode >= 48 && keyCode <= 57) { } else if (keyCode >= 48 && keyCode <= 57) {
// SFALL: Prevents from using 0 to escape from dialogue at any time.
if (keyCode == KEY_0 && gGameDialogFix) {
continue;
}
int v11 = keyCode - 49; int v11 = keyCode - 49;
if (v11 < gGameDialogOptionEntriesLength) { if (v11 < gGameDialogOptionEntriesLength) {
pageCount = 0; pageCount = 0;

1
src/sfall_config.h
View File

@ -53,6 +53,7 @@
#define SFALL_CONFIG_USE_SCIENCE_FRM_KEY "Science" #define SFALL_CONFIG_USE_SCIENCE_FRM_KEY "Science"
#define SFALL_CONFIG_USE_REPAIR_FRM_KEY "Repair" #define SFALL_CONFIG_USE_REPAIR_FRM_KEY "Repair"
#define SFALL_CONFIG_SCIENCE_REPAIR_TARGET_TYPE_KEY "ScienceOnCritters" #define SFALL_CONFIG_SCIENCE_REPAIR_TARGET_TYPE_KEY "ScienceOnCritters"
#define SFALL_CONFIG_GAME_DIALOG_FIX_KEY "DialogueFix"
#define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_MULTIPLIER 1 #define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_MULTIPLIER 1
#define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_DIVISOR 3 #define SFALL_CONFIG_BURST_MOD_DEFAULT_CENTER_DIVISOR 3