mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-23 03:52:12 -04:00
fix 'pwad endoom only' logic (#2138)
* fix 'pwad endoom only' logic * fixed code formatting
This commit is contained in:
parent
8d87277247
commit
6cd8c4e2c5
20
src/d_main.c
20
src/d_main.c
@ -1633,16 +1633,24 @@ static boolean AllowEndDoom(void)
|
|||||||
|| exit_sequence == EXIT_SEQUENCE_ENDOOM_ONLY));
|
|| exit_sequence == EXIT_SEQUENCE_ENDOOM_ONLY));
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean AllowEndDoomPWADOnly() {
|
|
||||||
return (!W_IsIWADLump(W_CheckNumForName("ENDOOM")) && endoom_pwad_only);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void D_EndDoom(void)
|
static void D_EndDoom(void)
|
||||||
{
|
{
|
||||||
if (AllowEndDoom() && AllowEndDoomPWADOnly())
|
// Do we even want to show an ENDOOM?
|
||||||
|
if (!AllowEndDoom())
|
||||||
{
|
{
|
||||||
D_ShowEndDoom();
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If so, is it from the IWAD?
|
||||||
|
bool iwad_endoom = W_IsIWADLump(W_CheckNumForName("ENDOOM"));
|
||||||
|
|
||||||
|
// Does the user want to see it, in that case?
|
||||||
|
if (iwad_endoom && endoom_pwad_only)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
D_ShowEndDoom();
|
||||||
}
|
}
|
||||||
|
|
||||||
// [FG] fast-forward demo to the desired map
|
// [FG] fast-forward demo to the desired map
|
||||||
|
Loading…
x
Reference in New Issue
Block a user