From ce269808dcdb930dcabf4ce7eb3649d00693df44 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Fri, 25 Sep 2020 18:06:06 +1000 Subject: [PATCH] - 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'". --- source/core/gameconfigfile.cpp | 2 -- source/core/menu/menudef.cpp | 8 -------- source/core/searchpaths.cpp | 4 +--- source/platform/posix/i_steam.cpp | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/source/core/gameconfigfile.cpp b/source/core/gameconfigfile.cpp index b532b2925..baa8ac907 100644 --- a/source/core/gameconfigfile.cpp +++ b/source/core/gameconfigfile.cpp @@ -198,7 +198,6 @@ void FGameConfigFile::DoAutoloadSetup (/*FIWadManager *iwad_man*/) // The same goes for auto-exec files. CreateStandardAutoExec("ShadowWarrior.AutoLoad", true); - CreateStandardAutoExec("IonFury.AutoLoad", true); CreateStandardAutoExec("Redneck.RidesAgain.AutoLoad", true); CreateStandardAutoExec("Redneck.Redneck.AutoLoad", true); CreateStandardAutoExec("WW2GI.AutoLoad", true); @@ -210,7 +209,6 @@ void FGameConfigFile::DoAutoloadSetup (/*FIWadManager *iwad_man*/) CreateStandardAutoExec("DukeNukem3D.Vacation.AutoLoad", true); CreateStandardAutoExec("ShadowWarrior.AutoLoad", true); - CreateStandardAutoExec("IonFury.AutoLoad", true); CreateStandardAutoExec("Redneck.RidesAgain.AutoLoad", true); CreateStandardAutoExec("Redneck.Redneck.AutoLoad", true); CreateStandardAutoExec("WW2GI.AutoLoad", true); diff --git a/source/core/menu/menudef.cpp b/source/core/menu/menudef.cpp index 8d1fadaca..bd0e551ee 100644 --- a/source/core/menu/menudef.cpp +++ b/source/core/menu/menudef.cpp @@ -151,7 +151,6 @@ static const gamefilter games[] = { { "NamOnly", GAMEFLAG_NAM}, // for cases where the difference matters. { "Napalm", GAMEFLAG_NAPALM}, { "WW2GI", GAMEFLAG_WW2GI}, - { "Fury", GAMEFLAG_FURY}, { "Redneck", GAMEFLAG_RR}, { "RedneckRides", GAMEFLAG_RRRA}, { "Deer", GAMEFLAG_DEER}, @@ -1144,13 +1143,6 @@ void M_ParseMenuDefs() OptionSettings.mFontColorHighlight = CR_WHITE; 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) { OptionSettings.mFontColor = CR_BROWN; diff --git a/source/core/searchpaths.cpp b/source/core/searchpaths.cpp index d125b1bf1..5579a6fad 100644 --- a/source/core/searchpaths.cpp +++ b/source/core/searchpaths.cpp @@ -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 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 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 580940", L"InstallLocation", redneck}, @@ -390,7 +389,6 @@ static TArray ParseGrpInfo(const char *fn, FileReader &fr, TMap ParseGrpInfo(const char *fn, FileReader &fr, TMap