diff --git a/source/common/searchpaths.cpp b/source/common/searchpaths.cpp index e687cec10..cde319846 100644 --- a/source/common/searchpaths.cpp +++ b/source/common/searchpaths.cpp @@ -90,7 +90,7 @@ struct RegistryPathInfo }; static const char * gameroot[] = { "/gameroot", nullptr}; -//static const char * dukeaddons[] = { "/gameroot", "/gameroot/addons/dc", "/gameroot/addons/nw", "/gameroot/addons/vacation", nullptr}; +static const char * dukeaddons[] = { "/gameroot", "/gameroot/addons/dc", "/gameroot/addons/nw", "/gameroot/addons/vacation", nullptr}; static const char * dn3d[] = { "/Duke Nukem 3D", nullptr}; static const char * nam[] = { "/NAM", nullptr}; static const char * ww2gi[] = { "/WW2GI", nullptr}; @@ -113,7 +113,7 @@ static const RegistryPathInfo paths[] = { { L"SOFTWARE" WOW64 "GOG.com\\Games\\1740836875", L"path", nullptr}, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 434050", L"InstallLocation", nullptr }, - { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 225140", L"InstallLocation", gameroot }, + { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 225140", L"InstallLocation", dukeaddons }, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 359850", L"InstallLocation", dn3d }, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 329650", L"InstallLocation", nam }, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 376750", L"InstallLocation", ww2gi }, diff --git a/wadsrc/static/engine/grpinfo.txt b/wadsrc/static/engine/grpinfo.txt index 799262d80..387937e1d 100644 --- a/wadsrc/static/engine/grpinfo.txt +++ b/wadsrc/static/engine/grpinfo.txt @@ -191,17 +191,6 @@ grpinfo gamefilter "Duke.DukeDC" } -addon -{ - // This is for loading the addon from the megaton edition without setting the path. - name "Duke it out in D.C." - flags GAMEFLAG_DUKE|GAMEFLAG_ADDON - dependency DUKE15_CRC - mustcontain "addons/dc/dukedc.grp" - loadgrp "addons/dc/dukedc.grp" - gamefilter "Duke.DukeDC" -} - // These are a bit strange but without anything to check I do not know in what way. // { "Duke Caribbean: Life's a Beach (1.3D)", VACA13_CRC, 23559381, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE13_CRC, NULL, process_vaca13}, // { "Duke Caribbean: Life's a Beach (PPak)", VACAPP_CRC, 22551333, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKEPP_CRC, NULL, process_vacapp15}, @@ -228,17 +217,6 @@ grpinfo gamefilter "Duke.Vacation" } -addon -{ - // This is for loading the addon from the megaton edition without setting the path. - name "Duke Caribbean: Life's a Beach" - flags GAMEFLAG_DUKE|GAMEFLAG_ADDON - dependency DUKE15_CRC - mustcontain "addons/vacation/vacation.grp" - loadgrp "addons/vacation/vacation.grp" - gamefilter "Duke.Vacation" -} - grpinfo { name "Duke: Nuclear Winter" @@ -250,19 +228,6 @@ grpinfo gamefilter "Duke.NWinter" } -addon -{ - // This is for loading the addon from the megaton edition without setting the path. - name "Duke: Nuclear Winter" - scriptname "NWINTER.CON" - flags GAMEFLAG_DUKE|GAMEFLAG_ADDON - dependency DUKE15_CRC - mustcontain "addons/nw/nwinter.grp" - loadgrp "addons/nw/nwinter.grp" - gamefilter "Duke.NWinter" -} - - grpinfo { name "Duke: Nuclear Winter Demo"