teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-18 23:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reverted special detection of Duke add-ons

Browse source 
The side effects here are worse than the benefit.
This commit is contained in:
Christoph Oelckers 2020-02-14 00:21:09 +01:00
parent a75b035552
commit 71485fe9d0
2 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/common/searchpaths.cpp
View file

@ -90,7 +90,7 @@ struct RegistryPathInfo
}; };
static const char * gameroot[] = { "/gameroot", nullptr}; 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 * dn3d[] = { "/Duke Nukem 3D", nullptr};
static const char * nam[] = { "/NAM", nullptr}; static const char * nam[] = { "/NAM", nullptr};
static const char * ww2gi[] = { "/WW2GI", 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" 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 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 359850", L"InstallLocation", dn3d },
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 329650", L"InstallLocation", nam }, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 329650", L"InstallLocation", nam },
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 376750", L"InstallLocation", ww2gi }, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 376750", L"InstallLocation", ww2gi },

35
wadsrc/static/engine/grpinfo.txt
View file

@ -191,17 +191,6 @@ grpinfo
gamefilter "Duke.DukeDC" 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. // 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 (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}, // { "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" 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 grpinfo
{ {
name "Duke: Nuclear Winter" name "Duke: Nuclear Winter"
@ -250,19 +228,6 @@ grpinfo
gamefilter "Duke.NWinter" 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 grpinfo
{ {
name "Duke: Nuclear Winter Demo" name "Duke: Nuclear Winter Demo"