diff --git a/polymer/eduke32/source/common.c b/polymer/eduke32/source/common.c index c1c2dead7..3a7bc8220 100644 --- a/polymer/eduke32/source/common.c +++ b/polymer/eduke32/source/common.c @@ -552,19 +552,13 @@ static void G_AddSteamPaths(const char *basepath) // Duke Nukem 3D: Megaton Edition (Steam) Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot", basepath); - addsearchpath_user(buf, SEARCHPATH_REMOVE); + addsearchpath_user(buf); Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot/addons/dc", basepath); addsearchpath_user(buf, SEARCHPATH_REMOVE); Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot/addons/nw", basepath); addsearchpath_user(buf, SEARCHPATH_REMOVE); Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot/addons/vacation", basepath); addsearchpath_user(buf, SEARCHPATH_REMOVE); - Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot/music", basepath); - addsearchpath(buf); - Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot/music/nwinter", basepath); - addsearchpath_user(buf, SEARCHPATH_NWINTER); - Bsnprintf(buf, sizeof(buf), "%s/steamapps/common/Duke Nukem 3D/gameroot/music/vacation", basepath); - addsearchpath(buf); // Duke Nukem 3D (3D Realms Anthology (Steam) / Kill-A-Ton Collection 2015) #if defined EDUKE32_OSX @@ -811,19 +805,13 @@ void G_AddSearchPaths(void) DWORD const remaining = sizeof(buf) - bufsize; Bstrncpy(suffix, "/gameroot", remaining); - addsearchpath_user(buf, SEARCHPATH_REMOVE); + addsearchpath(buf); Bstrncpy(suffix, "/gameroot/addons/dc", remaining); addsearchpath_user(buf, SEARCHPATH_REMOVE); Bstrncpy(suffix, "/gameroot/addons/nw", remaining); addsearchpath_user(buf, SEARCHPATH_REMOVE); Bstrncpy(suffix, "/gameroot/addons/vacation", remaining); addsearchpath_user(buf, SEARCHPATH_REMOVE); - Bstrncpy(suffix, "/gameroot/music", remaining); - addsearchpath(buf); - Bstrncpy(suffix, "/gameroot/music/nwinter", remaining); - addsearchpath_user(buf, SEARCHPATH_NWINTER); - Bstrncpy(suffix, "/gameroot/music/vacation", remaining); - addsearchpath(buf); } // Duke Nukem 3D (3D Realms Anthology (Steam) / Kill-A-Ton Collection 2015) @@ -885,9 +873,6 @@ void G_CleanupSearchPaths(void) if (!(NAM || NAPALM)) removesearchpaths_withuser(SEARCHPATH_NAM); - - if (!(NWINTER)) - removesearchpaths_withuser(SEARCHPATH_NWINTER); } ////////// diff --git a/polymer/eduke32/source/common_game.h b/polymer/eduke32/source/common_game.h index 8da598f66..f14bff9c5 100644 --- a/polymer/eduke32/source/common_game.h +++ b/polymer/eduke32/source/common_game.h @@ -23,7 +23,6 @@ extern int32_t usecwd; #define GAMEFLAG_SHAREWARE 0x00000020 #define GAMEFLAG_DUKEBETA 0x00000060 // includes 0x20 since it's a shareware beta #define GAMEFLAGMASK 0x0000007F // flags allowed from grpinfo -#define GAMEFLAG_NWINTER 0x00000080 extern struct grpfile_t const *g_selectedGrp; @@ -37,7 +36,6 @@ extern int32_t g_usingAddon; #define WW2GI (g_gameType & GAMEFLAG_WW2GI) #define SHAREWARE (g_gameType & GAMEFLAG_SHAREWARE) #define DUKEBETA ((g_gameType & GAMEFLAG_DUKEBETA) == GAMEFLAG_DUKEBETA) -#define NWINTER (g_gameType & GAMEFLAG_NWINTER) enum Games_t { GAME_DUKE = 0, @@ -60,8 +58,6 @@ enum instpath_t { enum searchpathtypes_t { SEARCHPATH_REMOVE = 1<<0, SEARCHPATH_NAM = 1<<1, - - SEARCHPATH_NWINTER = 1<<2, }; typedef enum basepal_ { diff --git a/polymer/eduke32/source/grpscan.c b/polymer/eduke32/source/grpscan.c index d3ce07151..6b08eb3c1 100644 --- a/polymer/eduke32/source/grpscan.c +++ b/polymer/eduke32/source/grpscan.c @@ -57,7 +57,7 @@ static grpinfo_t const internalgrpfiles[] = { "Duke Caribbean: Life's a Beach", VACA15_CRC, 22521880, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, NULL, NULL, process_vacapp15, NULL }, { "Duke Caribbean: Life's a Beach", DUKECB_CRC, 22213819, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, NULL, NULL, NULL, NULL }, { "Duke Caribbean: Life's a Beach", (int32_t)0x65B5F690, 22397273, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, "VACATION.CON", NULL, NULL, NULL }, - { "Duke: Nuclear Winter", DUKENW_CRC, 16169365, GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_NWINTER, DUKE15_CRC, "NWINTER.CON", NULL, NULL, NULL }, + { "Duke: Nuclear Winter", DUKENW_CRC, 16169365, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, "NWINTER.CON", NULL, NULL, NULL }, { "Duke!ZONE II (1.3D)", DZ2_13_CRC, 26135388, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE13_CRC, "DZ-GAME.CON", NULL, NULL, NULL }, { "Duke!ZONE II", DZ2_PP_CRC, 44100411, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, "DZ-GAME.CON", NULL, NULL, NULL }, { "Duke!ZONE II", (int32_t)0x1E9516F1, 3186656, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE15_CRC, "DZ-GAME.CON", NULL, NULL, NULL },