Remove: Settings NewGRF

Of limited use with support for base set parameters since OpenTTD 14, so maintenance of little use.

Author: zephyris

README.md

@@ -40,9 +40,7 @@ OpenGFX2 has graphical user preferences. These can be configured in `Game Option
 
 If you instead want for force a game or server to use OpenGFX2 graphics you can use the OpenGFX2 NewGRFs.
 
-Prior to OpenTTD 14.0 (specifically nightlies prior to 30/10/2023 or before Github commit e81313e) OpenTTD did not have a way to configure base set parameters. The `OpenGFX2 Settings` NewGRF provides a workaround: Go to `NewGRF Settings`, find `OpenGFX2 Settings` and add to `Active NewGRF files`. Then, select `OpenGFX2 Settings` in the `Active NewGRF files list` and select `Set parameters` then adjust the settings.
-
-Install other NewGRFs as normal using `NewGRF settings`.
+Install NewGRFs as normal using `NewGRF settings`.
 
 ## Building
 If you wish to build your own version of OpenGFX2 instead of using our prebuilt version, you can follow [these instructions](docs/building-opengfx2.md).

baseset/lang/english.lng

@@ -8,12 +8,8 @@ STR_GRF_URL                           :https://github.com/OpenTTD/OpenGFX2
 STR_OBG_DESCRIPTION_CLASSIC           :OpenGFX2 pixel art style base graphics set for OpenTTD, classic variant (normal zoom 8bpp). Freely available under the terms of the GNU General Public License version 2+. [{STRING}]
 STR_OBG_DESCRIPTION_HIGHDEF           :OpenGFX2 pixel art style base graphics set for OpenTTD, high definition variant (extra zoom 32bpp). Freely available under the terms of the GNU General Public License version 2+. [{STRING}]
 
-STR_WARN_SETTINGSGRF_VERSIONMISMATCH  :OpenGFX2 Settings NewGRF version does not match this version of the OpenGFX baseset. You may see unusual results!
-STR_WARN_SETTINGSGRF_NOTRECOMMENDED   :OpenGFX2 Settings NewGRF is not recommended for OpenTTD 14.0 and later. Base set parameters are recommended instead!
-
 STR_WARN_SETTINGSGRF_BASESETPARAM     :Baseset parameters.
 STR_WARN_SETTINGSGRF_HARDCODED        :Hardcoded parameters.
-STR_WARN_SETTINGSGRF_SETTINGSGRFPARAM :Settings NewGRF parameters.
 
 STR_PARAM_CURSOR_NAME                 :Mouse cursor
 STR_PARAM_CURSOR_DESC                 :Style and colour of the mouse cursor/pointer.
@@ -76,9 +72,6 @@ STR_PARAM_TREES_TROPICAL_DESC         :Tree style to use in the tropical climate
 STR_PARAM_TREES_TOYLAND_NAME          :Toyland trees
 STR_PARAM_TREES_TOYLAND_DESC          :Tree style to use in the toyland climate.
 
-STR_GRF_SETTINGS_NAME                 :OpenGFX2 Settings
-STR_GRF_SETTINGS_DESCRIPTION          :{ORANGE}OpenGFX2 Settings. Alters parameters used by the OpenGFX2 extra grf, hack to allow setting of baseset extra grf parameters.{BLACK}{}By Zephyris, standing on the shoulders of the OpenGFX team{}{BLACK}License: {SILVER}GPL v2+{}{BLACK}Website: {SILVER}https://github.com/OpenTTD/OpenGFX2
-
 STR_GRF_LANDSCAPE_NAME                :OpenGFX2+ Landscape
 STR_GRF_LANDSCAPE_DESCRIPTION         :{ORANGE}OpenGFX+ Landscape. Landscapes in the OpenGFX2 style.{BLACK}{}By Zephyris, standing on the shoulders of the OpenGFX team{}{BLACK}License: {SILVER}GPL v2+{}{BLACK}Website: {SILVER}https://github.com/OpenTTD/OpenGFX2
 

baseset/nml/extra/extra-header.pnml

@@ -300,32 +300,3 @@ if (openttd_version < version_openttd(14, 0)) {
 	param_trees_tropical = param_trees_tropical_;
 	param_trees_toyland = param_trees_toyland_;
 }
-
-// Check if the settings grf will be loaded, and load from its parameter values
-if (grf_future_status("OGZ\1")==1) {
-	//error(WARNING, string(STR_WARN_SETTINGSGRF_SETTINGSGRFPARAM));
-	// Check settings grf version, and warn if it's not the expected version to match this version of the base set
-	if (param["OGZ\1", 254]!=8) {
-		error(WARNING, string(STR_WARN_SETTINGSGRF_VERSIONMISMATCH));
-	}
-	// Check OpenTTD version, and warn if it's recommended to use base set parameters instead of the settings grf
-	if (openttd_version >= version_openttd(14, 0)) {
-		error(WARNING, string(STR_WARN_SETTINGSGRF_NOTRECOMMENDED));
-	}
-	// Load parameters from settings grf
-	param_cursors = param["OGZ\1", 1];
-	param_gridlines = param["OGZ\1", 2];
-	param_logos = param["OGZ\1", 3];
-	param_foundations_temperate = param["OGZ\1", 11];
-	param_foundations_arctic = param["OGZ\1", 21];
-	param_foundations_tropical = param["OGZ\1", 31];
-	param_foundations_toyland = param["OGZ\1", 41];
-	param_grass_temperate = param["OGZ\1", 10];
-	param_grass_arctic = param["OGZ\1", 20];
-	param_grass_tropical = param["OGZ\1", 30];
-	param_grass_toyland = param["OGZ\1", 40];
-	param_trees_temperate = param["OGZ\1", 12];
-	param_trees_arctic = param["OGZ\1", 22];
-	param_trees_tropical = param["OGZ\1", 32];
-	param_trees_toyland = param["OGZ\1", 42];
-}

makefile

@@ -106,7 +106,7 @@ baseset/%_32ez.grf: graphics_4 baseset/lang/*.lng FORCE
 
 # NewGRFs
 .PHONY: newgrf
-NEWGRFS = landscape objects settings stations trees trams
+NEWGRFS = landscape objects stations trees trams
 newgrf: $(foreach grf,$(NEWGRFS),newgrf/ogfx2_$(grf).grf)
 
 # GRF, via NML intermediate, for NewGRFs