zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 17:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove leftover Ion Fury stuffs causing log errors like "Script error, 'D:/Program Files (x86)/Steam/steamapps/common/Ion Fury/fury.grpinfo" line 10: Warning: GRP without game defined. Ignoring'".

Browse source
This commit is contained in:
Mitchell Richters 2020-09-25 18:06:06 +10:00
parent 4ff3810711
commit ce269808dc
4 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/gameconfigfile.cpp
View file

@ -198,7 +198,6 @@ void FGameConfigFile::DoAutoloadSetup (/*FIWadManager *iwad_man*/)
// The same goes for auto-exec files. // The same goes for auto-exec files.
CreateStandardAutoExec("ShadowWarrior.AutoLoad", true); CreateStandardAutoExec("ShadowWarrior.AutoLoad", true);
CreateStandardAutoExec("IonFury.AutoLoad", true);
CreateStandardAutoExec("Redneck.RidesAgain.AutoLoad", true); CreateStandardAutoExec("Redneck.RidesAgain.AutoLoad", true);
CreateStandardAutoExec("Redneck.Redneck.AutoLoad", true); CreateStandardAutoExec("Redneck.Redneck.AutoLoad", true);
CreateStandardAutoExec("WW2GI.AutoLoad", true); CreateStandardAutoExec("WW2GI.AutoLoad", true);
@ -210,7 +209,6 @@ void FGameConfigFile::DoAutoloadSetup (/*FIWadManager *iwad_man*/)
CreateStandardAutoExec("DukeNukem3D.Vacation.AutoLoad", true); CreateStandardAutoExec("DukeNukem3D.Vacation.AutoLoad", true);
CreateStandardAutoExec("ShadowWarrior.AutoLoad", true); CreateStandardAutoExec("ShadowWarrior.AutoLoad", true);
CreateStandardAutoExec("IonFury.AutoLoad", true);
CreateStandardAutoExec("Redneck.RidesAgain.AutoLoad", true); CreateStandardAutoExec("Redneck.RidesAgain.AutoLoad", true);
CreateStandardAutoExec("Redneck.Redneck.AutoLoad", true); CreateStandardAutoExec("Redneck.Redneck.AutoLoad", true);
CreateStandardAutoExec("WW2GI.AutoLoad", true); CreateStandardAutoExec("WW2GI.AutoLoad", true);

8
source/core/menu/menudef.cpp
View file

@ -151,7 +151,6 @@ static const gamefilter games[] = {
{ "NamOnly", GAMEFLAG_NAM}, // for cases where the difference matters. { "NamOnly", GAMEFLAG_NAM}, // for cases where the difference matters.
{ "Napalm", GAMEFLAG_NAPALM}, { "Napalm", GAMEFLAG_NAPALM},
{ "WW2GI", GAMEFLAG_WW2GI}, { "WW2GI", GAMEFLAG_WW2GI},
{ "Fury", GAMEFLAG_FURY},
{ "Redneck", GAMEFLAG_RR}, { "Redneck", GAMEFLAG_RR},
{ "RedneckRides", GAMEFLAG_RRRA}, { "RedneckRides", GAMEFLAG_RRRA},
{ "Deer", GAMEFLAG_DEER}, { "Deer", GAMEFLAG_DEER},
@ -1144,13 +1143,6 @@ void M_ParseMenuDefs()
OptionSettings.mFontColorHighlight = CR_WHITE; OptionSettings.mFontColorHighlight = CR_WHITE;
OptionSettings.mFontColorSelection = CR_DARKRED; OptionSettings.mFontColorSelection = CR_DARKRED;
} }
else if (g_gameType & GAMEFLAG_FURY)
{
OptionSettings.mFontColor = CR_TEAL;
OptionSettings.mFontColorHeader = CR_LIGHTBLUE;
OptionSettings.mFontColorHighlight = CR_ORANGE;
OptionSettings.mFontColorSelection = CR_GOLD;
}
else if (g_gameType & GAMEFLAG_RRALL) else if (g_gameType & GAMEFLAG_RRALL)
{ {
OptionSettings.mFontColor = CR_BROWN; OptionSettings.mFontColor = CR_BROWN;

4
source/core/searchpaths.cpp
View file

@ -122,7 +122,6 @@ static const RegistryPathInfo paths[] = {
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 225160", L"InstallLocation", swaddons }, // Shadow Warrior Classic Redux - Steam { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 225160", L"InstallLocation", swaddons }, // Shadow Warrior Classic Redux - Steam
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 238070", L"InstallLocation", gameroot}, // Shadow Warrior Classic (1997) - Steam { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 238070", L"InstallLocation", gameroot}, // Shadow Warrior Classic (1997) - Steam
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 358400", L"InstallLocation", sw}, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 358400", L"InstallLocation", sw},
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 562860", L"InstallLocation", nullptr}, // Ion Fury (Steam)
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 565550", L"InstallLocation", redneck}, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 565550", L"InstallLocation", redneck},
{ L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 580940", L"InstallLocation", redneck}, { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 580940", L"InstallLocation", redneck},
@ -390,7 +389,6 @@ static TArray<GrpInfo> ParseGrpInfo(const char *fn, FileReader &fr, TMap<FString
FlagMap.Insert("GAMEFLAG_ADDON", GAMEFLAG_ADDON); FlagMap.Insert("GAMEFLAG_ADDON", GAMEFLAG_ADDON);
FlagMap.Insert("GAMEFLAG_SHAREWARE", GAMEFLAG_SHAREWARE); FlagMap.Insert("GAMEFLAG_SHAREWARE", GAMEFLAG_SHAREWARE);
FlagMap.Insert("GAMEFLAG_DUKEBETA", GAMEFLAG_DUKEBETA); // includes 0x20 since it's a shareware beta FlagMap.Insert("GAMEFLAG_DUKEBETA", GAMEFLAG_DUKEBETA); // includes 0x20 since it's a shareware beta
FlagMap.Insert("GAMEFLAG_FURY", GAMEFLAG_FURY);
FlagMap.Insert("GAMEFLAG_RR", GAMEFLAG_RR); FlagMap.Insert("GAMEFLAG_RR", GAMEFLAG_RR);
FlagMap.Insert("GAMEFLAG_RRRA", GAMEFLAG_RRRA); FlagMap.Insert("GAMEFLAG_RRRA", GAMEFLAG_RRRA);
FlagMap.Insert("GAMEFLAG_DEER", GAMEFLAG_DEER); FlagMap.Insert("GAMEFLAG_DEER", GAMEFLAG_DEER);
@ -561,7 +559,7 @@ static TArray<GrpInfo> ParseGrpInfo(const char *fn, FileReader &fr, TMap<FString
} }
else sc.ScriptError(nullptr); else sc.ScriptError(nullptr);
} }
if (grp.dependencyCRC == 0 && (grp.flags & (GAMEFLAG_DUKE | GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_FURY | GAMEFLAG_RRALL | GAMEFLAG_BLOOD | GAMEFLAG_SW | GAMEFLAG_PSEXHUMED)) == 0) if (grp.dependencyCRC == 0 && (grp.flags & (GAMEFLAG_DUKE | GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_RRALL | GAMEFLAG_BLOOD | GAMEFLAG_SW | GAMEFLAG_PSEXHUMED)) == 0)
{ {
sc.ScriptMessage("Warning: GRP without game defined. Ignoring"); sc.ScriptMessage("Warning: GRP without game defined. Ignoring");
groups.Pop(); groups.Pop();

1
source/platform/posix/i_steam.cpp
View file

@ -154,7 +154,6 @@ const char *AppInfo[] =
"Shadow Warrior Classic/gameroot", "Shadow Warrior Classic/gameroot",
"Shadow Warrior Classic/gameroot/addons", "Shadow Warrior Classic/gameroot/addons",
"Shadow Warrior Original/gameroot", "Shadow Warrior Original/gameroot",
"Ion Fury",
"Blood", "Blood",
"One Unit Whole Blood", "One Unit Whole Blood",
"Nam/NAM", "Nam/NAM",