From 383c0b44421dd81176e5f128d5269392022d81fe Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Thu, 18 Aug 2022 23:05:37 +0700 Subject: [PATCH] add new steam dirs for Unity IWAD and Final Doom (#702) --- src/d_iwad.c | 4 ++++ src/d_main.c | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/d_iwad.c b/src/d_iwad.c index aae40f0e..2dd28fbc 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -211,6 +211,10 @@ static char *steam_install_subdirs[] = // From Doom 3: BFG Edition: "steamapps\\common\\DOOM 3 BFG Edition\\base\\wads", + + "steamapps\\common\\ultimate doom\\rerelease\\DOOM_Data\\StreamingAssets", + "steamapps\\common\\doom 2\\rerelease\\DOOM II_Data\\StreamingAssets", + "steamapps\\common\\doom 2\\finaldoombase" }; static char *GetRegistryString(registry_value_t *reg_val) diff --git a/src/d_main.c b/src/d_main.c index c431069d..ce13ef41 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -551,14 +551,10 @@ void D_DoAdvanceDemo(void) name = demostates[demosequence][gamemode].name; if (name && !strcasecmp(name, "TITLEPIC")) { - int i = W_CheckNumForName("TITLEPIC"); - int j = W_CheckNumForName("DMENUPIC"); - - if (i < 0 || (j >= 0 && W_IsIWADLump(i))) - name = (j >= 0) ? "DMENUPIC" : "INTERPIC"; + if (W_CheckNumForName("TITLEPIC") < 0) + name = "DMENUPIC"; } - demostates[demosequence][gamemode].func - (name); + demostates[demosequence][gamemode].func(name); } //