AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

expand exit sequence support to include PWAD endoom + no sound (#2095)

Browse Source 
* add PWAD ENDOOM option setting

* cleaned redundant parentheses
This commit is contained in:
elf-alchemist 2024-12-18 15:39:50 -03:00 committed by GitHub
parent 3f41e8f14d
commit df532c753d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/d_main.c
View File

@ -1636,15 +1636,17 @@ void D_SetBloodColor(void)
typedef enum {
EXIT_SEQUENCE_OFF, // Skip sound, skip ENDOOM.
EXIT_SEQUENCE_SOUND_ONLY, // Play sound, skip ENDOOM.
EXIT_SEQUENCE_PWAD_ENDOOM, // Play sound, show ENDOOM for PWADs only.
EXIT_SEQUENCE_ENDOOM_ONLY, // Skip sound, show ENDOOM.
EXIT_SEQUENCE_FULL // Play sound, show ENDOOM.
} exit_sequence_t;
static exit_sequence_t exit_sequence;
static boolean endoom_pwad_only;
boolean D_AllowQuitSound(void)
{
return (exit_sequence != EXIT_SEQUENCE_OFF);
return (exit_sequence == EXIT_SEQUENCE_FULL
|| exit_sequence == EXIT_SEQUENCE_SOUND_ONLY);
}
static void D_ShowEndDoom(void)
@ -1659,14 +1661,18 @@ boolean disable_endoom = false;
static boolean AllowEndDoom(void)
{
return !disable_endoom && (exit_sequence == EXIT_SEQUENCE_FULL
|| (exit_sequence == EXIT_SEQUENCE_PWAD_ENDOOM
&& !W_IsIWADLump(W_CheckNumForName("ENDOOM"))));
return (!disable_endoom
&& (exit_sequence == EXIT_SEQUENCE_FULL
|| exit_sequence == EXIT_SEQUENCE_ENDOOM_ONLY));
}
static boolean AllowEndDoomPWADOnly() {
return (!W_IsIWADLump(W_CheckNumForName("ENDOOM")) && endoom_pwad_only);
}
static void D_EndDoom(void)
{
if (AllowEndDoom())
if (AllowEndDoom() && AllowEndDoomPWADOnly())
{
D_ShowEndDoom();
}
@ -2694,7 +2700,8 @@ void D_DoomMain(void)
void D_BindMiscVariables(void)
{
BIND_NUM_GENERAL(exit_sequence, 0, 0, EXIT_SEQUENCE_FULL,
"Exit sequence (0 = Off; 1 = Sound Only; 2 = PWAD ENDOOM; 3 = Full)");
"Exit sequence (0 = Off; 1 = Sound Only; 2 = ENDOOM Only; 3 = Full)");
BIND_BOOL_GENERAL(endoom_pwad_only, false, "Show only ENDOOM from PWAD");
BIND_BOOL_GENERAL(demobar, false, "Show demo progress bar");
BIND_NUM_GENERAL(screen_melt, wipe_Melt, wipe_None, wipe_Fizzle,
"Screen wipe effect (0 = None; 1 = Melt; 2 = Crossfade; 3 = Fizzlefade)");

4
src/mn_setup.c
View File

@ -3229,7 +3229,7 @@ static void SmoothLight(void)
}
static const char *exit_sequence_strings[] = {
"Off", "Sound Only", "PWAD ENDOOM", "Full"
"Off", "Sound Only", "ENDOOM Only", "Full"
};
static const char *fuzzmode_strings[] = {
@ -3317,6 +3317,8 @@ static setup_menu_t gen_settings6[] = {
{"Exit Sequence", S_CHOICE, OFF_CNTR_X, M_SPC, {"exit_sequence"},
.strings_id = str_exit_sequence},
{"PWAD ENDOOM Only", S_ONOFF, OFF_CNTR_X, M_SPC, {"endoom_pwad_only"}},
MI_END
};