From b6491b4cb5ba9afb786343669eeac37d48a22283 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Mon, 19 Apr 2021 14:06:34 +0200 Subject: [PATCH] swap third and fifth state in the demostates[][] sequence so that a WAD's credit screen gets precedence over Woof!'s own Fixes #161 --- Source/d_main.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Source/d_main.c b/Source/d_main.c index 9757b91c..3b508518 100644 --- a/Source/d_main.c +++ b/Source/d_main.c @@ -439,20 +439,8 @@ static struct {G_DeferedPlayDemo, "demo1"}, }, - { - {D_SetPageName, NULL}, - {D_SetPageName, NULL}, - {D_SetPageName, NULL}, - {D_SetPageName, NULL}, - }, - - { - {G_DeferedPlayDemo, "demo2"}, - {G_DeferedPlayDemo, "demo2"}, - {G_DeferedPlayDemo, "demo2"}, - {G_DeferedPlayDemo, "demo2"}, - }, - + // [FG] swap third and fifth state in the sequence, + // so that a WAD's credit screen gets precedence over Woof!'s own { {D_SetPageName, "HELP2"}, {D_SetPageName, "HELP2"}, @@ -460,6 +448,22 @@ static struct {D_DrawTitle1, "TITLEPIC"}, }, + { + {G_DeferedPlayDemo, "demo2"}, + {G_DeferedPlayDemo, "demo2"}, + {G_DeferedPlayDemo, "demo2"}, + {G_DeferedPlayDemo, "demo2"}, + }, + + // [FG] swap third and fifth state in the sequence, + // so that a WAD's credit screen gets precedence over Woof!'s own + { + {D_SetPageName, NULL}, + {D_SetPageName, NULL}, + {D_SetPageName, NULL}, + {D_SetPageName, NULL}, + }, + { {G_DeferedPlayDemo, "demo3"}, {G_DeferedPlayDemo, "demo3"},