diff options
| -rw-r--r-- | config.lib | 12 | ||||
| -rw-r--r-- | media/extra_grf/openttd.nfo | 7 | ||||
| -rw-r--r-- | media/extra_grf/openttdgui.nfo | 11 | ||||
| -rw-r--r-- | media/extra_grf/shore.nfo | 14 |
4 files changed, 6 insertions, 38 deletions
diff --git a/config.lib b/config.lib index d3de42486..422db110b 100644 --- a/config.lib +++ b/config.lib @@ -3120,9 +3120,9 @@ detect_grfcodec() { log 2 " returned $version" log 2 " exit code $ret" - if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "904" ]; then - if [ -n "$version" ] && [ "$version" -lt "904" ]; then - log 1 "checking grfcodec... needs at least version 5.1.4 (r904), disabled" + if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then + if [ -n "$version" ] && [ "$version" -lt "913" ]; then + log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled" else log 1 "checking grfcodec... not found" fi @@ -3162,9 +3162,9 @@ detect_nforenum() { log 2 " returned $version" log 2 " exit code $ret" - if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then - if [ -n "$version" ] && [ "$version" -lt "846" ]; then - log 1 "checking nforenum... needs at least version 5.1.3 (r846), disabled" + if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then + if [ -n "$version" ] && [ "$version" -lt "913" ]; then + log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled" else log 1 "checking nforenum... not found" fi diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo index dea7bd803..e93b2066f 100644 --- a/media/extra_grf/openttd.nfo +++ b/media/extra_grf/openttd.nfo @@ -15,13 +15,6 @@ // // -// -- NFO Renum 'settings' -- -// Do not make nforenum warn about the fact that we use a reserved GRF ID -// @@WARNING DISABLE 101 -// -- End of NFO Renum 'settings' -- -// - -// // Number of sprites, it is wrong, but GRFcodec automagically gets it right. // 0 * 4 00 00 00 00 diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo index 6fb2b7c5f..c0127a975 100644 --- a/media/extra_grf/openttdgui.nfo +++ b/media/extra_grf/openttdgui.nfo @@ -6,12 +6,6 @@ // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. // -// -- NFO Renum 'settings' -- -// Do not make nforenum warn about the fact that we use more sprites. -// We are the 'authority' on how many sprites may be used. -// @@WARNING DISABLE 60 -// -- End of NFO Renum 'settings' -- -// -1 * 0 0C "OpenTTD GUI graphics" -1 * 3 05 15 A2 -1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal @@ -176,8 +170,3 @@ -1 sprites/openttdgui.png 8bpp 194 440 13 10 0 -2 normal -1 sprites/openttdgui.png 8bpp 215 440 9 10 0 0 normal -1 sprites/openttdgui.png 8bpp 232 440 8 10 0 0 normal - -// -- NFO Renum 'settings' -- -// Undo disabling the warning -// @@WARNING ENABLE 60 -// -- End of NFO Renum 'settings' -- diff --git a/media/extra_grf/shore.nfo b/media/extra_grf/shore.nfo index 1ba298245..70fae8f4d 100644 --- a/media/extra_grf/shore.nfo +++ b/media/extra_grf/shore.nfo @@ -7,13 +7,6 @@ // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. // -// -// -- NFO Renum 'settings' -- -// Do not make nforenum warn about the fact that we use an incorrect number of shores -// @@WARNING DISABLE 60 -// -- End of NFO Renum 'settings' -- -// - -1 * 6 07 83 01 \7! 00 0C -1 * 54 0C "Missing shore tile graphics for the temperate climate" -1 * 3 05 0D 0A @@ -66,10 +59,3 @@ -1 sprites/shore.png 8bpp 82 264 64 31 -31 -8 normal -1 sprites/shore.png 8bpp 162 264 64 32 -31 -1 normal -1 sprites/shore.png 8bpp 242 264 64 31 -31 -8 normal - -// -// -- NFO Renum 'settings' -- -// Reset warning about incorrect number of shores -// @@WARNING ENABLE 60 -// -- End of NFO Renum 'settings' -- -// |