diff --git a/source/common/menu/menudef.cpp b/source/common/menu/menudef.cpp index f289df4db..ad89b6c27 100644 --- a/source/common/menu/menudef.cpp +++ b/source/common/menu/menudef.cpp @@ -1079,7 +1079,7 @@ static void ParseImageScrollerBody(FScanner& sc, DImageScrollerDescriptor* desc) } else if (sc.Compare("ifnotgame")) { - if (!CheckSkipGameBlock(sc, true)) + if (!CheckSkipGameBlock(sc, false)) { // recursively parse sub-block ParseImageScrollerBody(sc, desc); diff --git a/source/sw/src/namelist.h b/source/sw/src/namelist.h index 36ba0d464..30ffa5fc9 100644 --- a/source/sw/src/namelist.h +++ b/source/sw/src/namelist.h @@ -159,3 +159,12 @@ x(YELLOW_CARD, 1779) x(YINYANG, 2870) x(SHADOW_WARRIOR, 2366) +x(ADSCREEN1, 5262) +x(ADSCREEN2, 5261) +x(SWORDER1, 5110) +x(SWORDER2, 5112) +x(CREDITS1, 5111) +x(CREDITS2, 5118) +x(SUPPORT, 4979) +x(ONLINE, 5113) + diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 7da5d2d42..6feb0df5e 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -223,16 +223,16 @@ ImageScroller "HelpMenu" QAVAnimationItem "Help5.qav" QAVAnimationItem "Help3b.qav" } + */ ifgame(ShadowWarrior) { // The menu has no default binding, but if someone tries to open it anyway show the cool retro ads that were shipped with the game. :D - ImageItem "#5262" - ifshareware(false) + ImageItem "ADSCREEN1" + ifnotgame (shareware) { - ImageItem "#5261" + ImageItem "ADSCREEN2" } } - */ } //------------------------------------------------------------------------------------------- @@ -331,19 +331,19 @@ ImageScroller "CreditsMenu" class "Blood.ImageScrollerMenu" QAVAnimationItem "Credits.qav" } + */ ifgame(ShadowWarrior) { - ifshareware(true) + ifgame (shareware) { - ImageItem "#5110" - ImageItem "#5112" + ImageItem "SWORDER1" + ImageItem "SWORDER2" } - ImageItem "#5111" - ImageItem "#5118" - ImageItem "#4979" - ImageItem "#5113" + ImageItem "CREDITS1" + ImageItem "CREDITS2" + ImageItem "SUPPORT" + ImageItem "ONLINE" } - */ } //-------------------------------------------------------------------------------------------