diff --git a/Makefile.grf.in b/Makefile.grf.in
index 196c11f0ff..a70b3072b0 100644
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -42,8 +42,8 @@ NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nfo
MD5SUM := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
# Some "should not be changed" settings.
-NFO_FILES := $(GRF_DIR)/*.nfo
-PNG_FILES := $(GRF_DIR)/*.png
+NFO_FILES := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo
+PNG_FILES := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png
# Build the GRF.
all: $(BIN_DIR)/openttd.grf
diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
index dec5be7b10..c790c4a648 100644
Binary files a/bin/data/openttd.grf and b/bin/data/openttd.grf differ
diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg
index 4a84fdd041..afc8b12e82 100644
--- a/bin/data/orig_dos.obg
+++ b/bin/data/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
+OPENTTD.GRF = f99b8f65d32a8883a2b0979eb2f6729f
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/data/orig_dos_de.obg b/bin/data/orig_dos_de.obg
index b0df8f006d..fadf4be88a 100644
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
+OPENTTD.GRF = f99b8f65d32a8883a2b0979eb2f6729f
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/data/orig_win.obg b/bin/data/orig_win.obg
index fd9aa875ec..2cd8d685ca 100644
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32
TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b
TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1
TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
+OPENTTD.GRF = f99b8f65d32a8883a2b0979eb2f6729f
[origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo
index 1ac9981132..fa46f4b303 100644
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -80,6 +80,7 @@
"David Dallaston: tram tracks" 0D
"Jonathan G. Rennison: aqueducts" 0D
"Bilbo, Jasper Vries: font" 0D
+ "Andrew Parkhouse: rivers" 0D
"OpenTTD developers: other graphics" 00
//
@@ -104,3 +105,8 @@
#include "chars.nfo"
#include "overrides.nfo"
#include "fix_graphics.nfo"
+#include "rivers/rapids.nfo"
+#include "rivers/temperate.nfo"
+#include "rivers/arctic.nfo"
+#include "rivers/tropic.nfo"
+#include "rivers/toyland.nfo"
diff --git a/media/extra_grf/rivers/arctic.nfo b/media/extra_grf/rivers/arctic.nfo
new file mode 100644
index 0000000000..d364db7105
--- /dev/null
+++ b/media/extra_grf/rivers/arctic.nfo
@@ -0,0 +1,282 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// 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 .
+//
+ -1 * 0 0C "Arctic river graphics by andythenorth (Andrew Parkhouse)"
+ -1 * 4 01 05 01 3C
+ -1 sprites/arctic_snowy.png 10 10 09 19 38 -5 0
+ -1 sprites/arctic_snowy.png 58 10 09 18 38 -5 13
+ -1 sprites/arctic_snowy.png 106 10 09 18 38 -31 13
+ -1 sprites/arctic_snowy.png 154 10 09 19 38 -31 0
+ -1 sprites/arctic_snowy.png 202 10 09 9 19 14 11
+ -1 sprites/arctic_snowy.png 234 10 09 9 16 -7 22
+ -1 sprites/arctic_snowy.png 266 10 09 9 19 -31 11
+ -1 sprites/arctic_snowy.png 298 10 09 9 16 -7 0
+ -1 sprites/arctic_snowy.png 330 10 09 6 8 25 13
+ -1 sprites/arctic_snowy.png 346 10 09 4 12 -5 27
+ -1 sprites/arctic_snowy.png 364 10 09 6 8 -31 13
+ -1 sprites/arctic_snowy.png 380 10 09 5 12 -5 0
+
+ -1 sprites/arctic_snowy.png 10 40 09 11 40 -7 0
+ -1 sprites/arctic_snowy.png 58 40 09 18 39 -6 5
+ -1 sprites/arctic_snowy.png 106 40 09 11 38 -31 12
+ -1 sprites/arctic_snowy.png 154 40 09 18 39 -31 0
+ -1 sprites/arctic_snowy.png 202 40 09 6 20 13 5
+ -1 sprites/arctic_snowy.png 234 40 09 7 13 -6 16
+ -1 sprites/arctic_snowy.png 266 40 09 6 20 -31 12
+ -1 sprites/arctic_snowy.png 298 40 09 7 13 -5 0
+ -1 sprites/arctic_snowy.png 330 40 09 5 8 25 6
+ -1 sprites/arctic_snowy.png 346 40 09 3 12 -5 20
+ -1 sprites/arctic_snowy.png 364 40 09 4 8 -31 13
+ -1 sprites/arctic_snowy.png 380 40 09 4 15 -7 0
+
+ -1 sprites/arctic_snowy.png 10 70 09 20 38 -5 -8
+ -1 sprites/arctic_snowy.png 58 70 09 26 38 -5 5
+ -1 sprites/arctic_snowy.png 106 70 09 20 37 -31 11
+ -1 sprites/arctic_snowy.png 154 70 09 27 38 -31 -8
+ -1 sprites/arctic_snowy.png 202 70 09 9 16 17 3
+ -1 sprites/arctic_snowy.png 234 70 09 9 15 -7 22
+ -1 sprites/arctic_snowy.png 266 70 09 9 16 -31 11
+ -1 sprites/arctic_snowy.png 298 70 09 9 15 -6 -8
+ -1 sprites/arctic_snowy.png 330 70 09 7 8 25 5
+ -1 sprites/arctic_snowy.png 346 70 09 5 10 -4 27
+ -1 sprites/arctic_snowy.png 364 70 09 7 8 -31 11
+ -1 sprites/arctic_snowy.png 380 70 09 6 12 -5 -8
+
+ -1 sprites/arctic_snowy.png 10 100 09 18 39 -6 0
+ -1 sprites/arctic_snowy.png 58 100 09 11 38 -5 12
+ -1 sprites/arctic_snowy.png 106 100 09 18 39 -31 5
+ -1 sprites/arctic_snowy.png 154 100 09 11 40 -32 0
+ -1 sprites/arctic_snowy.png 202 100 09 6 20 13 12
+ -1 sprites/arctic_snowy.png 234 100 09 7 13 -5 16
+ -1 sprites/arctic_snowy.png 266 100 09 6 20 -31 5
+ -1 sprites/arctic_snowy.png 298 100 09 7 13 -6 0
+ -1 sprites/arctic_snowy.png 330 100 09 4 8 26 13
+ -1 sprites/arctic_snowy.png 346 100 09 3 12 -5 20
+ -1 sprites/arctic_snowy.png 364 100 09 5 8 -31 6
+ -1 sprites/arctic_snowy.png 380 100 09 4 15 -6 0
+
+ -1 sprites/arctic_snowy.png 10 130 09 27 38 -5 -8
+ -1 sprites/arctic_snowy.png 58 130 09 20 37 -4 11
+ -1 sprites/arctic_snowy.png 106 130 09 26 37 -31 5
+ -1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
+ -1 sprites/arctic_snowy.png 202 130 09 9 16 17 11
+ -1 sprites/arctic_snowy.png 234 130 09 9 15 -6 22
+ -1 sprites/arctic_snowy.png 266 130 09 9 16 -31 3
+ -1 sprites/arctic_snowy.png 298 130 09 9 15 -7 -8
+ -1 sprites/arctic_snowy.png 330 130 09 7 8 25 11
+ -1 sprites/arctic_snowy.png 346 130 09 5 10 -4 26
+ -1 sprites/arctic_snowy.png 364 130 09 7 8 -31 5
+ -1 sprites/arctic_snowy.png 380 130 09 6 12 -5 -8
+ -1 * 7 02 05 30 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/arctic_brown.png 10 10 09 19 38 -5 0
+ -1 sprites/arctic_brown.png 58 10 09 18 38 -5 13
+ -1 sprites/arctic_brown.png 106 10 09 18 38 -31 13
+ -1 sprites/arctic_brown.png 154 10 09 19 38 -31 0
+ -1 sprites/arctic_brown.png 202 10 09 9 19 14 11
+ -1 sprites/arctic_brown.png 234 10 09 9 16 -7 22
+ -1 sprites/arctic_brown.png 266 10 09 9 19 -31 11
+ -1 sprites/arctic_brown.png 298 10 09 9 16 -7 0
+ -1 sprites/arctic_brown.png 330 10 09 6 8 25 13
+ -1 sprites/arctic_brown.png 346 10 09 4 12 -5 27
+ -1 sprites/arctic_brown.png 364 10 09 6 8 -31 13
+ -1 sprites/arctic_brown.png 380 10 09 5 12 -5 0
+
+ -1 sprites/arctic_brown.png 10 40 09 11 40 -7 0
+ -1 sprites/arctic_brown.png 58 40 09 18 39 -6 5
+ -1 sprites/arctic_brown.png 106 40 09 11 38 -31 12
+ -1 sprites/arctic_brown.png 154 40 09 18 39 -31 0
+ -1 sprites/arctic_brown.png 202 40 09 6 20 13 5
+ -1 sprites/arctic_brown.png 234 40 09 7 13 -6 16
+ -1 sprites/arctic_brown.png 266 40 09 6 20 -31 12
+ -1 sprites/arctic_brown.png 298 40 09 7 13 -5 0
+ -1 sprites/arctic_brown.png 330 40 09 5 8 25 6
+ -1 sprites/arctic_brown.png 346 40 09 3 12 -5 20
+ -1 sprites/arctic_brown.png 364 40 09 4 8 -31 13
+ -1 sprites/arctic_brown.png 380 40 09 4 15 -7 0
+
+ -1 sprites/arctic_brown.png 10 70 09 20 38 -5 -8
+ -1 sprites/arctic_brown.png 58 70 09 26 38 -5 5
+ -1 sprites/arctic_brown.png 106 70 09 20 37 -31 11
+ -1 sprites/arctic_brown.png 154 70 09 27 38 -31 -8
+ -1 sprites/arctic_brown.png 202 70 09 9 16 17 3
+ -1 sprites/arctic_brown.png 234 70 09 9 15 -7 22
+ -1 sprites/arctic_brown.png 266 70 09 9 16 -31 11
+ -1 sprites/arctic_brown.png 298 70 09 9 15 -6 -8
+ -1 sprites/arctic_brown.png 330 70 09 7 8 25 5
+ -1 sprites/arctic_brown.png 346 70 09 5 10 -4 27
+ -1 sprites/arctic_brown.png 364 70 09 7 8 -31 11
+ -1 sprites/arctic_brown.png 380 70 09 6 12 -5 -8
+
+ -1 sprites/arctic_brown.png 10 100 09 18 39 -6 0
+ -1 sprites/arctic_brown.png 58 100 09 11 38 -5 12
+ -1 sprites/arctic_brown.png 106 100 09 18 39 -31 5
+ -1 sprites/arctic_brown.png 154 100 09 11 40 -32 0
+ -1 sprites/arctic_brown.png 202 100 09 6 20 13 12
+ -1 sprites/arctic_brown.png 234 100 09 7 13 -5 16
+ -1 sprites/arctic_brown.png 266 100 09 6 20 -31 5
+ -1 sprites/arctic_brown.png 298 100 09 7 13 -6 0
+ -1 sprites/arctic_brown.png 330 100 09 4 8 26 13
+ -1 sprites/arctic_brown.png 346 100 09 3 12 -5 20
+ -1 sprites/arctic_brown.png 364 100 09 5 8 -31 6
+ -1 sprites/arctic_brown.png 380 100 09 4 15 -6 0
+
+ -1 sprites/arctic_brown.png 10 130 09 27 38 -5 -8
+ -1 sprites/arctic_brown.png 58 130 09 20 37 -4 11
+ -1 sprites/arctic_brown.png 106 130 09 26 37 -31 5
+ -1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
+ -1 sprites/arctic_brown.png 202 130 09 9 16 17 11
+ -1 sprites/arctic_brown.png 234 130 09 9 15 -6 22
+ -1 sprites/arctic_brown.png 266 130 09 9 16 -31 3
+ -1 sprites/arctic_brown.png 298 130 09 9 15 -7 -8
+ -1 sprites/arctic_brown.png 330 130 09 7 8 25 11
+ -1 sprites/arctic_brown.png 346 130 09 5 10 -4 26
+ -1 sprites/arctic_brown.png 364 130 09 7 8 -31 5
+ -1 sprites/arctic_brown.png 380 130 09 6 12 -5 -8
+ -1 * 7 02 05 31 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/arctic_snowy.png 10 210 09 19 38 -5 0
+ -1 sprites/arctic_snowy.png 58 210 09 18 38 -5 13
+ -1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
+ -1 sprites/arctic_snowy.png 154 210 09 19 38 -31 0
+ -1 sprites/arctic_snowy.png 202 210 09 9 19 14 11
+ -1 sprites/arctic_snowy.png 234 210 09 9 16 -7 22
+ -1 sprites/arctic_snowy.png 266 210 09 9 19 -31 11
+ -1 sprites/arctic_snowy.png 298 210 09 9 16 -7 0
+ -1 sprites/arctic_snowy.png 330 210 09 6 8 25 13
+ -1 sprites/arctic_snowy.png 346 210 09 4 12 -5 27
+ -1 sprites/arctic_snowy.png 364 210 09 6 8 -31 13
+ -1 sprites/arctic_snowy.png 380 210 09 5 12 -5 0
+
+ -1 sprites/arctic_snowy.png 10 240 09 11 40 -7 0
+ -1 sprites/arctic_snowy.png 58 240 09 18 39 -6 5
+ -1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
+ -1 sprites/arctic_snowy.png 154 240 09 18 39 -31 0
+ -1 sprites/arctic_snowy.png 202 240 09 6 20 13 5
+ -1 sprites/arctic_snowy.png 234 240 09 7 13 -6 16
+ -1 sprites/arctic_snowy.png 266 240 09 6 20 -31 12
+ -1 sprites/arctic_snowy.png 298 240 09 7 13 -5 0
+ -1 sprites/arctic_snowy.png 330 240 09 5 8 25 6
+ -1 sprites/arctic_snowy.png 346 240 09 3 12 -5 20
+ -1 sprites/arctic_snowy.png 364 240 09 4 8 -31 13
+ -1 sprites/arctic_snowy.png 380 240 09 4 15 -7 0
+
+ -1 sprites/arctic_snowy.png 10 270 09 20 38 -5 -8
+ -1 sprites/arctic_snowy.png 58 270 09 26 38 -5 5
+ -1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
+ -1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
+ -1 sprites/arctic_snowy.png 202 270 09 9 16 17 3
+ -1 sprites/arctic_snowy.png 234 270 09 9 15 -7 22
+ -1 sprites/arctic_snowy.png 266 270 09 9 16 -31 11
+ -1 sprites/arctic_snowy.png 298 270 09 9 15 -6 -8
+ -1 sprites/arctic_snowy.png 330 270 09 7 8 25 5
+ -1 sprites/arctic_snowy.png 346 270 09 5 10 -4 27
+ -1 sprites/arctic_snowy.png 364 270 09 7 8 -31 11
+ -1 sprites/arctic_snowy.png 380 270 09 6 12 -5 -8
+
+ -1 sprites/arctic_snowy.png 10 300 09 18 39 -6 0
+ -1 sprites/arctic_snowy.png 58 300 09 11 38 -5 12
+ -1 sprites/arctic_snowy.png 106 300 09 18 39 -31 5
+ -1 sprites/arctic_snowy.png 154 300 09 11 40 -32 0
+ -1 sprites/arctic_snowy.png 202 300 09 6 20 13 12
+ -1 sprites/arctic_snowy.png 234 300 09 7 13 -5 16
+ -1 sprites/arctic_snowy.png 266 300 09 6 20 -31 5
+ -1 sprites/arctic_snowy.png 298 300 09 7 13 -6 0
+ -1 sprites/arctic_snowy.png 330 300 09 4 8 26 13
+ -1 sprites/arctic_snowy.png 346 300 09 3 12 -5 20
+ -1 sprites/arctic_snowy.png 364 300 09 5 8 -31 6
+ -1 sprites/arctic_snowy.png 380 300 09 4 15 -6 0
+
+ -1 sprites/arctic_snowy.png 10 330 09 27 38 -5 -8
+ -1 sprites/arctic_snowy.png 58 330 09 20 37 -4 11
+ -1 sprites/arctic_snowy.png 106 330 09 26 37 -31 5
+ -1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
+ -1 sprites/arctic_snowy.png 202 330 09 9 16 17 11
+ -1 sprites/arctic_snowy.png 234 330 09 9 15 -6 22
+ -1 sprites/arctic_snowy.png 266 330 09 9 16 -31 3
+ -1 sprites/arctic_snowy.png 298 330 09 9 15 -7 -8
+ -1 sprites/arctic_snowy.png 330 330 09 7 8 25 11
+ -1 sprites/arctic_snowy.png 346 330 09 5 10 -4 26
+ -1 sprites/arctic_snowy.png 364 330 09 7 8 -31 5
+ -1 sprites/arctic_snowy.png 380 330 09 6 12 -5 -8
+ -1 * 7 02 05 32 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/arctic_brown.png 10 210 09 19 38 -5 0
+ -1 sprites/arctic_brown.png 58 210 09 18 38 -5 13
+ -1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
+ -1 sprites/arctic_brown.png 154 210 09 19 38 -31 0
+ -1 sprites/arctic_brown.png 202 210 09 9 19 14 11
+ -1 sprites/arctic_brown.png 234 210 09 9 16 -7 22
+ -1 sprites/arctic_brown.png 266 210 09 9 19 -31 11
+ -1 sprites/arctic_brown.png 298 210 09 9 16 -7 0
+ -1 sprites/arctic_brown.png 330 210 09 6 8 25 13
+ -1 sprites/arctic_brown.png 346 210 09 4 12 -5 27
+ -1 sprites/arctic_brown.png 364 210 09 6 8 -31 13
+ -1 sprites/arctic_brown.png 380 210 09 5 12 -5 0
+
+ -1 sprites/arctic_brown.png 10 240 09 11 40 -7 0
+ -1 sprites/arctic_brown.png 58 240 09 18 39 -6 5
+ -1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
+ -1 sprites/arctic_brown.png 154 240 09 18 39 -31 0
+ -1 sprites/arctic_brown.png 202 240 09 6 20 13 5
+ -1 sprites/arctic_brown.png 234 240 09 7 13 -6 16
+ -1 sprites/arctic_brown.png 266 240 09 6 20 -31 12
+ -1 sprites/arctic_brown.png 298 240 09 7 13 -5 0
+ -1 sprites/arctic_brown.png 330 240 09 5 8 25 6
+ -1 sprites/arctic_brown.png 346 240 09 3 12 -5 20
+ -1 sprites/arctic_brown.png 364 240 09 4 8 -31 13
+ -1 sprites/arctic_brown.png 380 240 09 4 15 -7 0
+
+ -1 sprites/arctic_brown.png 10 270 09 20 38 -5 -8
+ -1 sprites/arctic_brown.png 58 270 09 26 38 -5 5
+ -1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
+ -1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
+ -1 sprites/arctic_brown.png 202 270 09 9 16 17 3
+ -1 sprites/arctic_brown.png 234 270 09 9 15 -7 22
+ -1 sprites/arctic_brown.png 266 270 09 9 16 -31 11
+ -1 sprites/arctic_brown.png 298 270 09 9 15 -6 -8
+ -1 sprites/arctic_brown.png 330 270 09 7 8 25 5
+ -1 sprites/arctic_brown.png 346 270 09 5 10 -4 27
+ -1 sprites/arctic_brown.png 364 270 09 7 8 -31 11
+ -1 sprites/arctic_brown.png 380 270 09 6 12 -5 -8
+
+ -1 sprites/arctic_brown.png 10 300 09 18 39 -6 0
+ -1 sprites/arctic_brown.png 58 300 09 11 38 -5 12
+ -1 sprites/arctic_brown.png 106 300 09 18 39 -31 5
+ -1 sprites/arctic_brown.png 154 300 09 11 40 -32 0
+ -1 sprites/arctic_brown.png 202 300 09 6 20 13 12
+ -1 sprites/arctic_brown.png 234 300 09 7 13 -5 16
+ -1 sprites/arctic_brown.png 266 300 09 6 20 -31 5
+ -1 sprites/arctic_brown.png 298 300 09 7 13 -6 0
+ -1 sprites/arctic_brown.png 330 300 09 4 8 26 13
+ -1 sprites/arctic_brown.png 346 300 09 3 12 -5 20
+ -1 sprites/arctic_brown.png 364 300 09 5 8 -31 6
+ -1 sprites/arctic_brown.png 380 300 09 4 15 -6 0
+
+ -1 sprites/arctic_brown.png 10 330 09 27 38 -5 -8
+ -1 sprites/arctic_brown.png 58 330 09 20 37 -4 11
+ -1 sprites/arctic_brown.png 106 330 09 26 37 -31 5
+ -1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
+ -1 sprites/arctic_brown.png 202 330 09 9 16 17 11
+ -1 sprites/arctic_brown.png 234 330 09 9 15 -6 22
+ -1 sprites/arctic_brown.png 266 330 09 9 16 -31 3
+ -1 sprites/arctic_brown.png 298 330 09 9 15 -7 -8
+ -1 sprites/arctic_brown.png 330 330 09 7 8 25 11
+ -1 sprites/arctic_brown.png 346 330 09 5 10 -4 26
+ -1 sprites/arctic_brown.png 364 330 09 7 8 -31 5
+ -1 sprites/arctic_brown.png 380 330 09 6 12 -5 -8
+ -1 * 7 02 05 33 01 00 00 00
+
+ -1 * 14 02 05 34 81 81 00 FF 01 30 00 04 04 31 00
+ -1 * 14 02 05 35 81 81 00 FF 01 32 00 04 04 33 00
+ -1 * 14 02 05 36 81 80 00 FF 01 34 00 00 00 35 00
+ -1 * 6 07 83 01 \7! 01 01
+ -1 * 7 03 05 01 06 00 36 00
diff --git a/media/extra_grf/rivers/arctic_brown.png b/media/extra_grf/rivers/arctic_brown.png
new file mode 100644
index 0000000000..c2a6c94b44
Binary files /dev/null and b/media/extra_grf/rivers/arctic_brown.png differ
diff --git a/media/extra_grf/rivers/arctic_snowy.png b/media/extra_grf/rivers/arctic_snowy.png
new file mode 100644
index 0000000000..5e44e76887
Binary files /dev/null and b/media/extra_grf/rivers/arctic_snowy.png differ
diff --git a/media/extra_grf/rivers/rapids.nfo b/media/extra_grf/rivers/rapids.nfo
new file mode 100644
index 0000000000..34e6defdc5
--- /dev/null
+++ b/media/extra_grf/rivers/rapids.nfo
@@ -0,0 +1,139 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// 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 .
+//
+ -1 * 0 0C "Rapid graphics"
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 10 09 23 64 -31 0
+ -1 sprites/rapids.png 90 10 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 10 09 23 64 -31 0
+ -1 sprites/rapids.png 250 10 09 39 64 -31 -8
+ -1 * 7 02 05 00 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 60 09 23 64 -31 0
+ -1 sprites/rapids.png 90 60 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 60 09 23 64 -31 0
+ -1 sprites/rapids.png 250 60 09 39 64 -31 -8
+ -1 * 7 02 05 01 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 110 09 23 64 -31 0
+ -1 sprites/rapids.png 90 110 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 110 09 23 64 -31 0
+ -1 sprites/rapids.png 250 110 09 39 64 -31 -8
+ -1 * 7 02 05 02 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 160 09 23 64 -31 0
+ -1 sprites/rapids.png 90 160 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 160 09 23 64 -31 0
+ -1 sprites/rapids.png 250 160 09 39 64 -31 -8
+ -1 * 7 02 05 03 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 210 09 23 64 -31 0
+ -1 sprites/rapids.png 90 210 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 210 09 23 64 -31 0
+ -1 sprites/rapids.png 250 210 09 39 64 -31 -8
+ -1 * 7 02 05 04 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 260 09 23 64 -31 0
+ -1 sprites/rapids.png 90 260 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 260 09 23 64 -31 0
+ -1 sprites/rapids.png 250 260 09 39 64 -31 -8
+ -1 * 7 02 05 05 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 310 09 23 64 -31 0
+ -1 sprites/rapids.png 90 310 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 310 09 23 64 -31 0
+ -1 sprites/rapids.png 250 310 09 39 64 -31 -8
+ -1 * 7 02 05 06 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 360 09 23 64 -31 0
+ -1 sprites/rapids.png 90 360 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 360 09 23 64 -31 0
+ -1 sprites/rapids.png 250 360 09 39 64 -31 -8
+ -1 * 7 02 05 07 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 410 09 23 64 -31 0
+ -1 sprites/rapids.png 90 410 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 410 09 23 64 -31 0
+ -1 sprites/rapids.png 250 410 09 39 64 -31 -8
+ -1 * 7 02 05 08 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 460 09 23 64 -31 0
+ -1 sprites/rapids.png 90 460 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 460 09 23 64 -31 0
+ -1 sprites/rapids.png 250 460 09 39 64 -31 -8
+ -1 * 7 02 05 09 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 510 09 23 64 -31 0
+ -1 sprites/rapids.png 90 510 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 510 09 23 64 -31 0
+ -1 sprites/rapids.png 250 510 09 39 64 -31 -8
+ -1 * 7 02 05 0A 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 560 09 23 64 -31 0
+ -1 sprites/rapids.png 90 560 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 560 09 23 64 -31 0
+ -1 sprites/rapids.png 250 560 09 39 64 -31 -8
+ -1 * 7 02 05 0B 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 610 09 23 64 -31 0
+ -1 sprites/rapids.png 90 610 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 610 09 23 64 -31 0
+ -1 sprites/rapids.png 250 610 09 39 64 -31 -8
+ -1 * 7 02 05 0C 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 660 09 23 64 -31 0
+ -1 sprites/rapids.png 90 660 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 660 09 23 64 -31 0
+ -1 sprites/rapids.png 250 660 09 39 64 -31 -8
+ -1 * 7 02 05 0D 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 710 09 23 64 -31 0
+ -1 sprites/rapids.png 90 710 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 710 09 23 64 -31 0
+ -1 sprites/rapids.png 250 710 09 39 64 -31 -8
+ -1 * 7 02 05 0E 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/rapids.png 10 760 09 23 64 -31 0
+ -1 sprites/rapids.png 90 760 09 39 64 -31 -8
+ -1 sprites/rapids.png 170 760 09 23 64 -31 0
+ -1 sprites/rapids.png 250 760 09 39 64 -31 -8
+ -1 * 7 02 05 0F 01 00 00 00
+
+ -1 * 39 02 05 10 80 00 01 10
+ 00 00
+ 01 00
+ 02 00
+ 03 00
+ 04 00
+ 05 00
+ 06 00
+ 07 00
+ 08 00
+ 09 00
+ 0A 00
+ 0B 00
+ 0C 00
+ 0D 00
+ 0E 00
+ 0F 00
+ -1 * 7 03 05 01 05 00 10 00
diff --git a/media/extra_grf/rivers/rapids.png b/media/extra_grf/rivers/rapids.png
new file mode 100644
index 0000000000..db25ae0e35
Binary files /dev/null and b/media/extra_grf/rivers/rapids.png differ
diff --git a/media/extra_grf/rivers/temperate.nfo b/media/extra_grf/rivers/temperate.nfo
new file mode 100644
index 0000000000..3d54536022
--- /dev/null
+++ b/media/extra_grf/rivers/temperate.nfo
@@ -0,0 +1,146 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// 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 .
+//
+ -1 * 0 0C "Temperate river graphics by andythenorth (Andrew Parkhouse)"
+ -1 * 4 01 05 01 3C
+ -1 sprites/temperate.png 10 10 09 19 38 -5 0
+ -1 sprites/temperate.png 58 10 09 18 38 -5 13
+ -1 sprites/temperate.png 106 10 09 18 38 -31 13
+ -1 sprites/temperate.png 154 10 09 19 38 -31 0
+ -1 sprites/temperate.png 202 10 09 9 19 14 11
+ -1 sprites/temperate.png 234 10 09 9 16 -7 22
+ -1 sprites/temperate.png 266 10 09 9 19 -31 11
+ -1 sprites/temperate.png 298 10 09 9 16 -7 0
+ -1 sprites/temperate.png 330 10 09 6 8 25 13
+ -1 sprites/temperate.png 346 10 09 4 12 -5 27
+ -1 sprites/temperate.png 364 10 09 6 8 -31 13
+ -1 sprites/temperate.png 380 10 09 5 12 -5 0
+
+ -1 sprites/temperate.png 10 40 09 11 40 -7 0
+ -1 sprites/temperate.png 58 40 09 18 39 -6 5
+ -1 sprites/temperate.png 106 40 09 11 38 -31 12
+ -1 sprites/temperate.png 154 40 09 18 39 -31 0
+ -1 sprites/temperate.png 202 40 09 6 20 13 5
+ -1 sprites/temperate.png 234 40 09 7 13 -6 16
+ -1 sprites/temperate.png 266 40 09 6 20 -31 12
+ -1 sprites/temperate.png 298 40 09 7 13 -5 0
+ -1 sprites/temperate.png 330 40 09 5 8 25 6
+ -1 sprites/temperate.png 346 40 09 3 12 -5 20
+ -1 sprites/temperate.png 364 40 09 4 8 -31 13
+ -1 sprites/temperate.png 380 40 09 4 15 -7 0
+
+ -1 sprites/temperate.png 10 70 09 20 38 -5 -8
+ -1 sprites/temperate.png 58 70 09 26 38 -5 5
+ -1 sprites/temperate.png 106 70 09 20 37 -31 11
+ -1 sprites/temperate.png 154 70 09 27 38 -31 -8
+ -1 sprites/temperate.png 202 70 09 9 16 17 3
+ -1 sprites/temperate.png 234 70 09 9 15 -7 22
+ -1 sprites/temperate.png 266 70 09 9 16 -31 11
+ -1 sprites/temperate.png 298 70 09 9 15 -6 -8
+ -1 sprites/temperate.png 330 70 09 7 8 25 5
+ -1 sprites/temperate.png 346 70 09 5 10 -4 27
+ -1 sprites/temperate.png 364 70 09 7 8 -31 11
+ -1 sprites/temperate.png 380 70 09 6 12 -5 -8
+
+ -1 sprites/temperate.png 10 100 09 18 39 -6 0
+ -1 sprites/temperate.png 58 100 09 11 38 -5 12
+ -1 sprites/temperate.png 106 100 09 18 39 -31 5
+ -1 sprites/temperate.png 154 100 09 11 40 -32 0
+ -1 sprites/temperate.png 202 100 09 6 20 13 12
+ -1 sprites/temperate.png 234 100 09 7 13 -5 16
+ -1 sprites/temperate.png 266 100 09 6 20 -31 5
+ -1 sprites/temperate.png 298 100 09 7 13 -6 0
+ -1 sprites/temperate.png 330 100 09 4 8 26 13
+ -1 sprites/temperate.png 346 100 09 3 12 -5 20
+ -1 sprites/temperate.png 364 100 09 5 8 -31 6
+ -1 sprites/temperate.png 380 100 09 4 15 -6 0
+
+ -1 sprites/temperate.png 10 130 09 27 38 -5 -8
+ -1 sprites/temperate.png 58 130 09 20 37 -4 11
+ -1 sprites/temperate.png 106 130 09 26 37 -31 5
+ -1 sprites/temperate.png 154 130 09 20 38 -31 -8
+ -1 sprites/temperate.png 202 130 09 9 16 17 11
+ -1 sprites/temperate.png 234 130 09 9 15 -6 22
+ -1 sprites/temperate.png 266 130 09 9 16 -31 3
+ -1 sprites/temperate.png 298 130 09 9 15 -7 -8
+ -1 sprites/temperate.png 330 130 09 7 8 25 11
+ -1 sprites/temperate.png 346 130 09 5 10 -4 26
+ -1 sprites/temperate.png 364 130 09 7 8 -31 5
+ -1 sprites/temperate.png 380 130 09 6 12 -5 -8
+ -1 * 7 02 05 20 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/temperate.png 10 210 09 19 38 -5 0
+ -1 sprites/temperate.png 58 210 09 18 38 -5 13
+ -1 sprites/temperate.png 106 210 09 18 38 -31 13
+ -1 sprites/temperate.png 154 210 09 19 38 -31 0
+ -1 sprites/temperate.png 202 210 09 9 19 14 11
+ -1 sprites/temperate.png 234 210 09 9 16 -7 22
+ -1 sprites/temperate.png 266 210 09 9 19 -31 11
+ -1 sprites/temperate.png 298 210 09 9 16 -7 0
+ -1 sprites/temperate.png 330 210 09 6 8 25 13
+ -1 sprites/temperate.png 346 210 09 4 12 -5 27
+ -1 sprites/temperate.png 364 210 09 6 8 -31 13
+ -1 sprites/temperate.png 380 210 09 5 12 -5 0
+
+ -1 sprites/temperate.png 10 240 09 11 40 -7 0
+ -1 sprites/temperate.png 58 240 09 18 39 -6 5
+ -1 sprites/temperate.png 106 240 09 11 38 -31 12
+ -1 sprites/temperate.png 154 240 09 18 39 -31 0
+ -1 sprites/temperate.png 202 240 09 6 20 13 5
+ -1 sprites/temperate.png 234 240 09 7 13 -6 16
+ -1 sprites/temperate.png 266 240 09 6 20 -31 12
+ -1 sprites/temperate.png 298 240 09 7 13 -5 0
+ -1 sprites/temperate.png 330 240 09 5 8 25 6
+ -1 sprites/temperate.png 346 240 09 3 12 -5 20
+ -1 sprites/temperate.png 364 240 09 4 8 -31 13
+ -1 sprites/temperate.png 380 240 09 4 15 -7 0
+
+ -1 sprites/temperate.png 10 270 09 20 38 -5 -8
+ -1 sprites/temperate.png 58 270 09 26 38 -5 5
+ -1 sprites/temperate.png 106 270 09 20 37 -31 11
+ -1 sprites/temperate.png 154 270 09 27 38 -31 -8
+ -1 sprites/temperate.png 202 270 09 9 16 17 3
+ -1 sprites/temperate.png 234 270 09 9 15 -7 22
+ -1 sprites/temperate.png 266 270 09 9 16 -31 11
+ -1 sprites/temperate.png 298 270 09 9 15 -6 -8
+ -1 sprites/temperate.png 330 270 09 7 8 25 5
+ -1 sprites/temperate.png 346 270 09 5 10 -4 27
+ -1 sprites/temperate.png 364 270 09 7 8 -31 11
+ -1 sprites/temperate.png 380 270 09 6 12 -5 -8
+
+ -1 sprites/temperate.png 10 300 09 18 39 -6 0
+ -1 sprites/temperate.png 58 300 09 11 38 -5 12
+ -1 sprites/temperate.png 106 300 09 18 39 -31 5
+ -1 sprites/temperate.png 154 300 09 11 40 -32 0
+ -1 sprites/temperate.png 202 300 09 6 20 13 12
+ -1 sprites/temperate.png 234 300 09 7 13 -5 16
+ -1 sprites/temperate.png 266 300 09 6 20 -31 5
+ -1 sprites/temperate.png 298 300 09 7 13 -6 0
+ -1 sprites/temperate.png 330 300 09 4 8 26 13
+ -1 sprites/temperate.png 346 300 09 3 12 -5 20
+ -1 sprites/temperate.png 364 300 09 5 8 -31 6
+ -1 sprites/temperate.png 380 300 09 4 15 -6 0
+
+ -1 sprites/temperate.png 10 330 09 27 38 -5 -8
+ -1 sprites/temperate.png 58 330 09 20 37 -4 11
+ -1 sprites/temperate.png 106 330 09 26 37 -31 5
+ -1 sprites/temperate.png 154 330 09 20 38 -31 -8
+ -1 sprites/temperate.png 202 330 09 9 16 17 11
+ -1 sprites/temperate.png 234 330 09 9 15 -6 22
+ -1 sprites/temperate.png 266 330 09 9 16 -31 3
+ -1 sprites/temperate.png 298 330 09 9 15 -7 -8
+ -1 sprites/temperate.png 330 330 09 7 8 25 11
+ -1 sprites/temperate.png 346 330 09 5 10 -4 26
+ -1 sprites/temperate.png 364 330 09 7 8 -31 5
+ -1 sprites/temperate.png 380 330 09 6 12 -5 -8
+ -1 * 7 02 05 21 01 00 00 00
+
+ -1 * 14 02 05 22 81 80 00 FF 01 20 00 00 00 21 00
+ -1 * 6 07 83 01 \7! 00 01
+ -1 * 7 03 05 01 06 00 22 00
diff --git a/media/extra_grf/rivers/temperate.png b/media/extra_grf/rivers/temperate.png
new file mode 100644
index 0000000000..61ff224301
Binary files /dev/null and b/media/extra_grf/rivers/temperate.png differ
diff --git a/media/extra_grf/rivers/toyland.nfo b/media/extra_grf/rivers/toyland.nfo
new file mode 100644
index 0000000000..747d23222b
--- /dev/null
+++ b/media/extra_grf/rivers/toyland.nfo
@@ -0,0 +1,146 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// 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 .
+//
+ -1 * 0 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
+ -1 * 4 01 05 01 3C
+ -1 sprites/toyland.png 10 10 09 19 38 -5 0
+ -1 sprites/toyland.png 58 10 09 18 38 -5 13
+ -1 sprites/toyland.png 106 10 09 18 38 -31 13
+ -1 sprites/toyland.png 154 10 09 19 38 -31 0
+ -1 sprites/toyland.png 202 10 09 9 19 14 11
+ -1 sprites/toyland.png 234 10 09 9 16 -7 22
+ -1 sprites/toyland.png 266 10 09 9 19 -31 11
+ -1 sprites/toyland.png 298 10 09 9 16 -7 0
+ -1 sprites/toyland.png 330 10 09 6 8 25 13
+ -1 sprites/toyland.png 346 10 09 4 12 -5 27
+ -1 sprites/toyland.png 364 10 09 6 8 -31 13
+ -1 sprites/toyland.png 380 10 09 5 12 -5 0
+
+ -1 sprites/toyland.png 10 40 09 11 40 -7 0
+ -1 sprites/toyland.png 58 40 09 18 39 -6 5
+ -1 sprites/toyland.png 106 40 09 11 38 -31 12
+ -1 sprites/toyland.png 154 40 09 18 39 -31 0
+ -1 sprites/toyland.png 202 40 09 6 20 13 5
+ -1 sprites/toyland.png 234 40 09 7 13 -6 16
+ -1 sprites/toyland.png 266 40 09 6 20 -31 12
+ -1 sprites/toyland.png 298 40 09 7 13 -5 0
+ -1 sprites/toyland.png 330 40 09 5 8 25 6
+ -1 sprites/toyland.png 346 40 09 3 12 -5 20
+ -1 sprites/toyland.png 364 40 09 4 8 -31 13
+ -1 sprites/toyland.png 380 40 09 4 15 -7 0
+
+ -1 sprites/toyland.png 10 70 09 20 38 -5 -8
+ -1 sprites/toyland.png 58 70 09 26 38 -5 5
+ -1 sprites/toyland.png 106 70 09 20 37 -31 11
+ -1 sprites/toyland.png 154 70 09 27 38 -31 -8
+ -1 sprites/toyland.png 202 70 09 9 16 17 3
+ -1 sprites/toyland.png 234 70 09 9 15 -7 22
+ -1 sprites/toyland.png 266 70 09 9 16 -31 11
+ -1 sprites/toyland.png 298 70 09 9 15 -6 -8
+ -1 sprites/toyland.png 330 70 09 7 8 25 5
+ -1 sprites/toyland.png 346 70 09 5 10 -4 27
+ -1 sprites/toyland.png 364 70 09 7 8 -31 11
+ -1 sprites/toyland.png 380 70 09 6 12 -5 -8
+
+ -1 sprites/toyland.png 10 100 09 18 39 -6 0
+ -1 sprites/toyland.png 58 100 09 11 38 -5 12
+ -1 sprites/toyland.png 106 100 09 18 39 -31 5
+ -1 sprites/toyland.png 154 100 09 11 40 -32 0
+ -1 sprites/toyland.png 202 100 09 6 20 13 12
+ -1 sprites/toyland.png 234 100 09 7 13 -5 16
+ -1 sprites/toyland.png 266 100 09 6 20 -31 5
+ -1 sprites/toyland.png 298 100 09 7 13 -6 0
+ -1 sprites/toyland.png 330 100 09 4 8 26 13
+ -1 sprites/toyland.png 346 100 09 3 12 -5 20
+ -1 sprites/toyland.png 364 100 09 5 8 -31 6
+ -1 sprites/toyland.png 380 100 09 4 15 -6 0
+
+ -1 sprites/toyland.png 10 130 09 27 38 -5 -8
+ -1 sprites/toyland.png 58 130 09 20 37 -4 11
+ -1 sprites/toyland.png 106 130 09 26 37 -31 5
+ -1 sprites/toyland.png 154 130 09 20 38 -31 -8
+ -1 sprites/toyland.png 202 130 09 9 16 17 11
+ -1 sprites/toyland.png 234 130 09 9 15 -6 22
+ -1 sprites/toyland.png 266 130 09 9 16 -31 3
+ -1 sprites/toyland.png 298 130 09 9 15 -7 -8
+ -1 sprites/toyland.png 330 130 09 7 8 25 11
+ -1 sprites/toyland.png 346 130 09 5 10 -4 26
+ -1 sprites/toyland.png 364 130 09 7 8 -31 5
+ -1 sprites/toyland.png 380 130 09 6 12 -5 -8
+ -1 * 7 02 05 50 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/toyland.png 10 210 09 19 38 -5 0
+ -1 sprites/toyland.png 58 210 09 18 38 -5 13
+ -1 sprites/toyland.png 106 210 09 18 38 -31 13
+ -1 sprites/toyland.png 154 210 09 19 38 -31 0
+ -1 sprites/toyland.png 202 210 09 9 19 14 11
+ -1 sprites/toyland.png 234 210 09 9 16 -7 22
+ -1 sprites/toyland.png 266 210 09 9 19 -31 11
+ -1 sprites/toyland.png 298 210 09 9 16 -7 0
+ -1 sprites/toyland.png 330 210 09 6 8 25 13
+ -1 sprites/toyland.png 346 210 09 4 12 -5 27
+ -1 sprites/toyland.png 364 210 09 6 8 -31 13
+ -1 sprites/toyland.png 380 210 09 5 12 -5 0
+
+ -1 sprites/toyland.png 10 240 09 11 40 -7 0
+ -1 sprites/toyland.png 58 240 09 18 39 -6 5
+ -1 sprites/toyland.png 106 240 09 11 38 -31 12
+ -1 sprites/toyland.png 154 240 09 18 39 -31 0
+ -1 sprites/toyland.png 202 240 09 6 20 13 5
+ -1 sprites/toyland.png 234 240 09 7 13 -6 16
+ -1 sprites/toyland.png 266 240 09 6 20 -31 12
+ -1 sprites/toyland.png 298 240 09 7 13 -5 0
+ -1 sprites/toyland.png 330 240 09 5 8 25 6
+ -1 sprites/toyland.png 346 240 09 3 12 -5 20
+ -1 sprites/toyland.png 364 240 09 4 8 -31 13
+ -1 sprites/toyland.png 380 240 09 4 15 -7 0
+
+ -1 sprites/toyland.png 10 270 09 20 38 -5 -8
+ -1 sprites/toyland.png 58 270 09 26 38 -5 5
+ -1 sprites/toyland.png 106 270 09 20 37 -31 11
+ -1 sprites/toyland.png 154 270 09 27 38 -31 -8
+ -1 sprites/toyland.png 202 270 09 9 16 17 3
+ -1 sprites/toyland.png 234 270 09 9 15 -7 22
+ -1 sprites/toyland.png 266 270 09 9 16 -31 11
+ -1 sprites/toyland.png 298 270 09 9 15 -6 -8
+ -1 sprites/toyland.png 330 270 09 7 8 25 5
+ -1 sprites/toyland.png 346 270 09 5 10 -4 27
+ -1 sprites/toyland.png 364 270 09 7 8 -31 11
+ -1 sprites/toyland.png 380 270 09 6 12 -5 -8
+
+ -1 sprites/toyland.png 10 300 09 18 39 -6 0
+ -1 sprites/toyland.png 58 300 09 11 38 -5 12
+ -1 sprites/toyland.png 106 300 09 18 39 -31 5
+ -1 sprites/toyland.png 154 300 09 11 40 -32 0
+ -1 sprites/toyland.png 202 300 09 6 20 13 12
+ -1 sprites/toyland.png 234 300 09 7 13 -5 16
+ -1 sprites/toyland.png 266 300 09 6 20 -31 5
+ -1 sprites/toyland.png 298 300 09 7 13 -6 0
+ -1 sprites/toyland.png 330 300 09 4 8 26 13
+ -1 sprites/toyland.png 346 300 09 3 12 -5 20
+ -1 sprites/toyland.png 364 300 09 5 8 -31 6
+ -1 sprites/toyland.png 380 300 09 4 15 -6 0
+
+ -1 sprites/toyland.png 10 330 09 27 38 -5 -8
+ -1 sprites/toyland.png 58 330 09 20 37 -4 11
+ -1 sprites/toyland.png 106 330 09 26 37 -31 5
+ -1 sprites/toyland.png 154 330 09 20 38 -31 -8
+ -1 sprites/toyland.png 202 330 09 9 16 17 11
+ -1 sprites/toyland.png 234 330 09 9 15 -6 22
+ -1 sprites/toyland.png 266 330 09 9 16 -31 3
+ -1 sprites/toyland.png 298 330 09 9 15 -7 -8
+ -1 sprites/toyland.png 330 330 09 7 8 25 11
+ -1 sprites/toyland.png 346 330 09 5 10 -4 26
+ -1 sprites/toyland.png 364 330 09 7 8 -31 5
+ -1 sprites/toyland.png 380 330 09 6 12 -5 -8
+ -1 * 7 02 05 51 01 00 00 00
+
+ -1 * 14 02 05 52 81 80 00 FF 01 50 00 00 00 51 00
+ -1 * 6 07 83 01 \7! 03 01
+ -1 * 7 03 05 01 06 00 52 00
diff --git a/media/extra_grf/rivers/toyland.png b/media/extra_grf/rivers/toyland.png
new file mode 100644
index 0000000000..61ff224301
Binary files /dev/null and b/media/extra_grf/rivers/toyland.png differ
diff --git a/media/extra_grf/rivers/tropic.nfo b/media/extra_grf/rivers/tropic.nfo
new file mode 100644
index 0000000000..efc6e8c249
--- /dev/null
+++ b/media/extra_grf/rivers/tropic.nfo
@@ -0,0 +1,282 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// 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 .
+//
+ -1 * 0 0C "Tropic river graphics by andythenorth (Andrew Parkhouse)"
+ -1 * 4 01 05 01 3C
+ -1 sprites/tropic_desert.png 10 10 09 19 38 -5 0
+ -1 sprites/tropic_desert.png 58 10 09 18 38 -5 13
+ -1 sprites/tropic_desert.png 106 10 09 18 38 -31 13
+ -1 sprites/tropic_desert.png 154 10 09 19 38 -31 0
+ -1 sprites/tropic_desert.png 202 10 09 9 19 14 11
+ -1 sprites/tropic_desert.png 234 10 09 9 16 -7 22
+ -1 sprites/tropic_desert.png 266 10 09 9 19 -31 11
+ -1 sprites/tropic_desert.png 298 10 09 9 16 -7 0
+ -1 sprites/tropic_desert.png 330 10 09 6 8 25 13
+ -1 sprites/tropic_desert.png 346 10 09 4 12 -5 27
+ -1 sprites/tropic_desert.png 364 10 09 6 8 -31 13
+ -1 sprites/tropic_desert.png 380 10 09 5 12 -5 0
+
+ -1 sprites/tropic_desert.png 10 40 09 11 40 -7 0
+ -1 sprites/tropic_desert.png 58 40 09 18 39 -6 5
+ -1 sprites/tropic_desert.png 106 40 09 11 38 -31 12
+ -1 sprites/tropic_desert.png 154 40 09 18 39 -31 0
+ -1 sprites/tropic_desert.png 202 40 09 6 20 13 5
+ -1 sprites/tropic_desert.png 234 40 09 7 13 -6 16
+ -1 sprites/tropic_desert.png 266 40 09 6 20 -31 12
+ -1 sprites/tropic_desert.png 298 40 09 7 13 -5 0
+ -1 sprites/tropic_desert.png 330 40 09 5 8 25 6
+ -1 sprites/tropic_desert.png 346 40 09 3 12 -5 20
+ -1 sprites/tropic_desert.png 364 40 09 4 8 -31 13
+ -1 sprites/tropic_desert.png 380 40 09 4 15 -7 0
+
+ -1 sprites/tropic_desert.png 10 70 09 20 38 -5 -8
+ -1 sprites/tropic_desert.png 58 70 09 26 38 -5 5
+ -1 sprites/tropic_desert.png 106 70 09 20 37 -31 11
+ -1 sprites/tropic_desert.png 154 70 09 27 38 -31 -8
+ -1 sprites/tropic_desert.png 202 70 09 9 16 17 3
+ -1 sprites/tropic_desert.png 234 70 09 9 15 -7 22
+ -1 sprites/tropic_desert.png 266 70 09 9 16 -31 11
+ -1 sprites/tropic_desert.png 298 70 09 9 15 -6 -8
+ -1 sprites/tropic_desert.png 330 70 09 7 8 25 5
+ -1 sprites/tropic_desert.png 346 70 09 5 10 -4 27
+ -1 sprites/tropic_desert.png 364 70 09 7 8 -31 11
+ -1 sprites/tropic_desert.png 380 70 09 6 12 -5 -8
+
+ -1 sprites/tropic_desert.png 10 100 09 18 39 -6 0
+ -1 sprites/tropic_desert.png 58 100 09 11 38 -5 12
+ -1 sprites/tropic_desert.png 106 100 09 18 39 -31 5
+ -1 sprites/tropic_desert.png 154 100 09 11 40 -32 0
+ -1 sprites/tropic_desert.png 202 100 09 6 20 13 12
+ -1 sprites/tropic_desert.png 234 100 09 7 13 -5 16
+ -1 sprites/tropic_desert.png 266 100 09 6 20 -31 5
+ -1 sprites/tropic_desert.png 298 100 09 7 13 -6 0
+ -1 sprites/tropic_desert.png 330 100 09 4 8 26 13
+ -1 sprites/tropic_desert.png 346 100 09 3 12 -5 20
+ -1 sprites/tropic_desert.png 364 100 09 5 8 -31 6
+ -1 sprites/tropic_desert.png 380 100 09 4 15 -6 0
+
+ -1 sprites/tropic_desert.png 10 130 09 27 38 -5 -8
+ -1 sprites/tropic_desert.png 58 130 09 20 37 -4 11
+ -1 sprites/tropic_desert.png 106 130 09 26 37 -31 5
+ -1 sprites/tropic_desert.png 154 130 09 20 38 -31 -8
+ -1 sprites/tropic_desert.png 202 130 09 9 16 17 11
+ -1 sprites/tropic_desert.png 234 130 09 9 15 -6 22
+ -1 sprites/tropic_desert.png 266 130 09 9 16 -31 3
+ -1 sprites/tropic_desert.png 298 130 09 9 15 -7 -8
+ -1 sprites/tropic_desert.png 330 130 09 7 8 25 11
+ -1 sprites/tropic_desert.png 346 130 09 5 10 -4 26
+ -1 sprites/tropic_desert.png 364 130 09 7 8 -31 5
+ -1 sprites/tropic_desert.png 380 130 09 6 12 -5 -8
+ -1 * 7 02 05 40 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/tropic_forest.png 10 10 09 19 38 -5 0
+ -1 sprites/tropic_forest.png 58 10 09 18 38 -5 13
+ -1 sprites/tropic_forest.png 106 10 09 18 38 -31 13
+ -1 sprites/tropic_forest.png 154 10 09 19 38 -31 0
+ -1 sprites/tropic_forest.png 202 10 09 9 19 14 11
+ -1 sprites/tropic_forest.png 234 10 09 9 16 -7 22
+ -1 sprites/tropic_forest.png 266 10 09 9 19 -31 11
+ -1 sprites/tropic_forest.png 298 10 09 9 16 -7 0
+ -1 sprites/tropic_forest.png 330 10 09 6 8 25 13
+ -1 sprites/tropic_forest.png 346 10 09 4 12 -5 27
+ -1 sprites/tropic_forest.png 364 10 09 6 8 -31 13
+ -1 sprites/tropic_forest.png 380 10 09 5 12 -5 0
+
+ -1 sprites/tropic_forest.png 10 40 09 11 40 -7 0
+ -1 sprites/tropic_forest.png 58 40 09 18 39 -6 5
+ -1 sprites/tropic_forest.png 106 40 09 11 38 -31 12
+ -1 sprites/tropic_forest.png 154 40 09 18 39 -31 0
+ -1 sprites/tropic_forest.png 202 40 09 6 20 13 5
+ -1 sprites/tropic_forest.png 234 40 09 7 13 -6 16
+ -1 sprites/tropic_forest.png 266 40 09 6 20 -31 12
+ -1 sprites/tropic_forest.png 298 40 09 7 13 -5 0
+ -1 sprites/tropic_forest.png 330 40 09 5 8 25 6
+ -1 sprites/tropic_forest.png 346 40 09 3 12 -5 20
+ -1 sprites/tropic_forest.png 364 40 09 4 8 -31 13
+ -1 sprites/tropic_forest.png 380 40 09 4 15 -7 0
+
+ -1 sprites/tropic_forest.png 10 70 09 20 38 -5 -8
+ -1 sprites/tropic_forest.png 58 70 09 26 38 -5 5
+ -1 sprites/tropic_forest.png 106 70 09 20 37 -31 11
+ -1 sprites/tropic_forest.png 154 70 09 27 38 -31 -8
+ -1 sprites/tropic_forest.png 202 70 09 9 16 17 3
+ -1 sprites/tropic_forest.png 234 70 09 9 15 -7 22
+ -1 sprites/tropic_forest.png 266 70 09 9 16 -31 11
+ -1 sprites/tropic_forest.png 298 70 09 9 15 -6 -8
+ -1 sprites/tropic_forest.png 330 70 09 7 8 25 5
+ -1 sprites/tropic_forest.png 346 70 09 5 10 -4 27
+ -1 sprites/tropic_forest.png 364 70 09 7 8 -31 11
+ -1 sprites/tropic_forest.png 380 70 09 6 12 -5 -8
+
+ -1 sprites/tropic_forest.png 10 100 09 18 39 -6 0
+ -1 sprites/tropic_forest.png 58 100 09 11 38 -5 12
+ -1 sprites/tropic_forest.png 106 100 09 18 39 -31 5
+ -1 sprites/tropic_forest.png 154 100 09 11 40 -32 0
+ -1 sprites/tropic_forest.png 202 100 09 6 20 13 12
+ -1 sprites/tropic_forest.png 234 100 09 7 13 -5 16
+ -1 sprites/tropic_forest.png 266 100 09 6 20 -31 5
+ -1 sprites/tropic_forest.png 298 100 09 7 13 -6 0
+ -1 sprites/tropic_forest.png 330 100 09 4 8 26 13
+ -1 sprites/tropic_forest.png 346 100 09 3 12 -5 20
+ -1 sprites/tropic_forest.png 364 100 09 5 8 -31 6
+ -1 sprites/tropic_forest.png 380 100 09 4 15 -6 0
+
+ -1 sprites/tropic_forest.png 10 130 09 27 38 -5 -8
+ -1 sprites/tropic_forest.png 58 130 09 20 37 -4 11
+ -1 sprites/tropic_forest.png 106 130 09 26 37 -31 5
+ -1 sprites/tropic_forest.png 154 130 09 20 38 -31 -8
+ -1 sprites/tropic_forest.png 202 130 09 9 16 17 11
+ -1 sprites/tropic_forest.png 234 130 09 9 15 -6 22
+ -1 sprites/tropic_forest.png 266 130 09 9 16 -31 3
+ -1 sprites/tropic_forest.png 298 130 09 9 15 -7 -8
+ -1 sprites/tropic_forest.png 330 130 09 7 8 25 11
+ -1 sprites/tropic_forest.png 346 130 09 5 10 -4 26
+ -1 sprites/tropic_forest.png 364 130 09 7 8 -31 5
+ -1 sprites/tropic_forest.png 380 130 09 6 12 -5 -8
+ -1 * 7 02 05 41 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/tropic_desert.png 10 210 09 19 38 -5 0
+ -1 sprites/tropic_desert.png 58 210 09 18 38 -5 13
+ -1 sprites/tropic_desert.png 106 210 09 18 38 -31 13
+ -1 sprites/tropic_desert.png 154 210 09 19 38 -31 0
+ -1 sprites/tropic_desert.png 202 210 09 9 19 14 11
+ -1 sprites/tropic_desert.png 234 210 09 9 16 -7 22
+ -1 sprites/tropic_desert.png 266 210 09 9 19 -31 11
+ -1 sprites/tropic_desert.png 298 210 09 9 16 -7 0
+ -1 sprites/tropic_desert.png 330 210 09 6 8 25 13
+ -1 sprites/tropic_desert.png 346 210 09 4 12 -5 27
+ -1 sprites/tropic_desert.png 364 210 09 6 8 -31 13
+ -1 sprites/tropic_desert.png 380 210 09 5 12 -5 0
+
+ -1 sprites/tropic_desert.png 10 240 09 11 40 -7 0
+ -1 sprites/tropic_desert.png 58 240 09 18 39 -6 5
+ -1 sprites/tropic_desert.png 106 240 09 11 38 -31 12
+ -1 sprites/tropic_desert.png 154 240 09 18 39 -31 0
+ -1 sprites/tropic_desert.png 202 240 09 6 20 13 5
+ -1 sprites/tropic_desert.png 234 240 09 7 13 -6 16
+ -1 sprites/tropic_desert.png 266 240 09 6 20 -31 12
+ -1 sprites/tropic_desert.png 298 240 09 7 13 -5 0
+ -1 sprites/tropic_desert.png 330 240 09 5 8 25 6
+ -1 sprites/tropic_desert.png 346 240 09 3 12 -5 20
+ -1 sprites/tropic_desert.png 364 240 09 4 8 -31 13
+ -1 sprites/tropic_desert.png 380 240 09 4 15 -7 0
+
+ -1 sprites/tropic_desert.png 10 270 09 20 38 -5 -8
+ -1 sprites/tropic_desert.png 58 270 09 26 38 -5 5
+ -1 sprites/tropic_desert.png 106 270 09 20 37 -31 11
+ -1 sprites/tropic_desert.png 154 270 09 27 38 -31 -8
+ -1 sprites/tropic_desert.png 202 270 09 9 16 17 3
+ -1 sprites/tropic_desert.png 234 270 09 9 15 -7 22
+ -1 sprites/tropic_desert.png 266 270 09 9 16 -31 11
+ -1 sprites/tropic_desert.png 298 270 09 9 15 -6 -8
+ -1 sprites/tropic_desert.png 330 270 09 7 8 25 5
+ -1 sprites/tropic_desert.png 346 270 09 5 10 -4 27
+ -1 sprites/tropic_desert.png 364 270 09 7 8 -31 11
+ -1 sprites/tropic_desert.png 380 270 09 6 12 -5 -8
+
+ -1 sprites/tropic_desert.png 10 300 09 18 39 -6 0
+ -1 sprites/tropic_desert.png 58 300 09 11 38 -5 12
+ -1 sprites/tropic_desert.png 106 300 09 18 39 -31 5
+ -1 sprites/tropic_desert.png 154 300 09 11 40 -32 0
+ -1 sprites/tropic_desert.png 202 300 09 6 20 13 12
+ -1 sprites/tropic_desert.png 234 300 09 7 13 -5 16
+ -1 sprites/tropic_desert.png 266 300 09 6 20 -31 5
+ -1 sprites/tropic_desert.png 298 300 09 7 13 -6 0
+ -1 sprites/tropic_desert.png 330 300 09 4 8 26 13
+ -1 sprites/tropic_desert.png 346 300 09 3 12 -5 20
+ -1 sprites/tropic_desert.png 364 300 09 5 8 -31 6
+ -1 sprites/tropic_desert.png 380 300 09 4 15 -6 0
+
+ -1 sprites/tropic_desert.png 10 330 09 27 38 -5 -8
+ -1 sprites/tropic_desert.png 58 330 09 20 37 -4 11
+ -1 sprites/tropic_desert.png 106 330 09 26 37 -31 5
+ -1 sprites/tropic_desert.png 154 330 09 20 38 -31 -8
+ -1 sprites/tropic_desert.png 202 330 09 9 16 17 11
+ -1 sprites/tropic_desert.png 234 330 09 9 15 -6 22
+ -1 sprites/tropic_desert.png 266 330 09 9 16 -31 3
+ -1 sprites/tropic_desert.png 298 330 09 9 15 -7 -8
+ -1 sprites/tropic_desert.png 330 330 09 7 8 25 11
+ -1 sprites/tropic_desert.png 346 330 09 5 10 -4 26
+ -1 sprites/tropic_desert.png 364 330 09 7 8 -31 5
+ -1 sprites/tropic_desert.png 380 330 09 6 12 -5 -8
+ -1 * 7 02 05 42 01 00 00 00
+
+ -1 * 4 01 05 01 3C
+ -1 sprites/tropic_forest.png 10 210 09 19 38 -5 0
+ -1 sprites/tropic_forest.png 58 210 09 18 38 -5 13
+ -1 sprites/tropic_forest.png 106 210 09 18 38 -31 13
+ -1 sprites/tropic_forest.png 154 210 09 19 38 -31 0
+ -1 sprites/tropic_forest.png 202 210 09 9 19 14 11
+ -1 sprites/tropic_forest.png 234 210 09 9 16 -7 22
+ -1 sprites/tropic_forest.png 266 210 09 9 19 -31 11
+ -1 sprites/tropic_forest.png 298 210 09 9 16 -7 0
+ -1 sprites/tropic_forest.png 330 210 09 6 8 25 13
+ -1 sprites/tropic_forest.png 346 210 09 4 12 -5 27
+ -1 sprites/tropic_forest.png 364 210 09 6 8 -31 13
+ -1 sprites/tropic_forest.png 380 210 09 5 12 -5 0
+
+ -1 sprites/tropic_forest.png 10 240 09 11 40 -7 0
+ -1 sprites/tropic_forest.png 58 240 09 18 39 -6 5
+ -1 sprites/tropic_forest.png 106 240 09 11 38 -31 12
+ -1 sprites/tropic_forest.png 154 240 09 18 39 -31 0
+ -1 sprites/tropic_forest.png 202 240 09 6 20 13 5
+ -1 sprites/tropic_forest.png 234 240 09 7 13 -6 16
+ -1 sprites/tropic_forest.png 266 240 09 6 20 -31 12
+ -1 sprites/tropic_forest.png 298 240 09 7 13 -5 0
+ -1 sprites/tropic_forest.png 330 240 09 5 8 25 6
+ -1 sprites/tropic_forest.png 346 240 09 3 12 -5 20
+ -1 sprites/tropic_forest.png 364 240 09 4 8 -31 13
+ -1 sprites/tropic_forest.png 380 240 09 4 15 -7 0
+
+ -1 sprites/tropic_forest.png 10 270 09 20 38 -5 -8
+ -1 sprites/tropic_forest.png 58 270 09 26 38 -5 5
+ -1 sprites/tropic_forest.png 106 270 09 20 37 -31 11
+ -1 sprites/tropic_forest.png 154 270 09 27 38 -31 -8
+ -1 sprites/tropic_forest.png 202 270 09 9 16 17 3
+ -1 sprites/tropic_forest.png 234 270 09 9 15 -7 22
+ -1 sprites/tropic_forest.png 266 270 09 9 16 -31 11
+ -1 sprites/tropic_forest.png 298 270 09 9 15 -6 -8
+ -1 sprites/tropic_forest.png 330 270 09 7 8 25 5
+ -1 sprites/tropic_forest.png 346 270 09 5 10 -4 27
+ -1 sprites/tropic_forest.png 364 270 09 7 8 -31 11
+ -1 sprites/tropic_forest.png 380 270 09 6 12 -5 -8
+
+ -1 sprites/tropic_forest.png 10 300 09 18 39 -6 0
+ -1 sprites/tropic_forest.png 58 300 09 11 38 -5 12
+ -1 sprites/tropic_forest.png 106 300 09 18 39 -31 5
+ -1 sprites/tropic_forest.png 154 300 09 11 40 -32 0
+ -1 sprites/tropic_forest.png 202 300 09 6 20 13 12
+ -1 sprites/tropic_forest.png 234 300 09 7 13 -5 16
+ -1 sprites/tropic_forest.png 266 300 09 6 20 -31 5
+ -1 sprites/tropic_forest.png 298 300 09 7 13 -6 0
+ -1 sprites/tropic_forest.png 330 300 09 4 8 26 13
+ -1 sprites/tropic_forest.png 346 300 09 3 12 -5 20
+ -1 sprites/tropic_forest.png 364 300 09 5 8 -31 6
+ -1 sprites/tropic_forest.png 380 300 09 4 15 -6 0
+
+ -1 sprites/tropic_forest.png 10 330 09 27 38 -5 -8
+ -1 sprites/tropic_forest.png 58 330 09 20 37 -4 11
+ -1 sprites/tropic_forest.png 106 330 09 26 37 -31 5
+ -1 sprites/tropic_forest.png 154 330 09 20 38 -31 -8
+ -1 sprites/tropic_forest.png 202 330 09 9 16 17 11
+ -1 sprites/tropic_forest.png 234 330 09 9 15 -6 22
+ -1 sprites/tropic_forest.png 266 330 09 9 16 -31 3
+ -1 sprites/tropic_forest.png 298 330 09 9 15 -7 -8
+ -1 sprites/tropic_forest.png 330 330 09 7 8 25 11
+ -1 sprites/tropic_forest.png 346 330 09 5 10 -4 26
+ -1 sprites/tropic_forest.png 364 330 09 7 8 -31 5
+ -1 sprites/tropic_forest.png 380 330 09 6 12 -5 -8
+ -1 * 7 02 05 43 01 00 00 00
+
+ -1 * 14 02 05 44 81 81 00 FF 01 40 00 01 01 41 00
+ -1 * 14 02 05 45 81 81 00 FF 01 42 00 01 01 43 00
+ -1 * 14 02 05 46 81 80 00 FF 01 44 00 00 00 45 00
+ -1 * 6 07 83 01 \7! 02 01
+ -1 * 7 03 05 01 06 00 46 00
diff --git a/media/extra_grf/rivers/tropic_desert.png b/media/extra_grf/rivers/tropic_desert.png
new file mode 100644
index 0000000000..868468637c
Binary files /dev/null and b/media/extra_grf/rivers/tropic_desert.png differ
diff --git a/media/extra_grf/rivers/tropic_forest.png b/media/extra_grf/rivers/tropic_forest.png
new file mode 100644
index 0000000000..1aa21e479e
Binary files /dev/null and b/media/extra_grf/rivers/tropic_forest.png differ
diff --git a/readme.txt b/readme.txt
index 1326b9d254..a7a8f32ac8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -591,51 +591,52 @@ Once you have all missing files, you are set to go.
X.X) Credits
---- -------
The OpenTTD team (in alphabetical order):
- Albert Hofkamp (Alberth) - GUI expert
- Jean-François Claeys (Belugas) - GUI, newindustries and more
- Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework
- Christoph Elsenhans (frosch) - General coding
- Loïc Guilloux (glx) - Windows Expert
- Michael Lutz (michi_cc) - Path based signals
- Owen Rudge (orudge) - Forum host, OS/2 port
- Peter Nelson (peter1138) - Spiritual descendant from newGRF gods
- Ingo von Borstel (planetmaker) - Support
- Remko Bijker (Rubidium) - Lead coder and way more
- Zdeněk Sojka (SmatZ) - Bug finder and fixer
- José Soler (Terkhen) - General coding
- Thijs Marinussen (Yexo) - AI Framework
+ Albert Hofkamp (Alberth) - GUI expert
+ Jean-François Claeys (Belugas) - GUI, newindustries and more
+ Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework
+ Christoph Elsenhans (frosch) - General coding
+ Loïc Guilloux (glx) - Windows Expert
+ Michael Lutz (michi_cc) - Path based signals
+ Owen Rudge (orudge) - Forum host, OS/2 port
+ Peter Nelson (peter1138) - Spiritual descendant from newGRF gods
+ Ingo von Borstel (planetmaker) - Support
+ Remko Bijker (Rubidium) - Lead coder and way more
+ Zdeněk Sojka (SmatZ) - Bug finder and fixer
+ José Soler (Terkhen) - General coding
+ Thijs Marinussen (Yexo) - AI Framework
Inactive Developers:
- Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles
- Victor Fischer (Celestar) - Programming everywhere you need him to
- Tamás Faragó (Darkvater) - Ex-Lead coder
- Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)
- Jonathan Coome (Maedhros) - High priest of the NewGRF Temple
- Attila Bán (MiHaMiX) - WebTranslator 1 and 2
- Christoph Mallon (Tron) - Programmer, code correctness police
+ Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles
+ Victor Fischer (Celestar) - Programming everywhere you need him to
+ Tamás Faragó (Darkvater) - Ex-Lead coder
+ Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)
+ Jonathan Coome (Maedhros) - High priest of the NewGRF Temple
+ Attila Bán (MiHaMiX) - WebTranslator 1 and 2
+ Christoph Mallon (Tron) - Programmer, code correctness police
Retired Developers:
- Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3)
- Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)
- Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6)
- Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
- Patric Stout (TrueLight) - Programmer (0.3 - pre0.7), sys op (active)
+ Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3)
+ Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)
+ Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6)
+ Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
+ Patric Stout (TrueLight) - Programmer (0.3 - pre0.7), sys op (active)
Thanks to:
- Josef Drexler - For his great work on TTDPatch.
- Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
- Petr Baudiš (pasky) - Many patches, newgrf support, etc.
- Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with
- Stefan Meißner (sign_de) - For his work on the console
- Mike Ragsdale - OpenTTD installer
- Cian Duffy (MYOB) - BeOS port / manual writing
- Christian Rosentreter (tokai) - MorphOS / AmigaOS port
- Richard Kempton (RichK67) - Additional airports, initial TGP implementation
- Alberto Demichelis - Squirrel scripting language
- L. Peter Deutsch - MD5 implementation
- Michael Blunck - For revolutionizing TTD with awesome graphics
- George - Canal graphics
- David Dallaston (Pikka) - Tram tracks
- All Translators - For their support to make OpenTTD a truly international game
- Bug Reporters - Thanks for all bug reports
- Chris Sawyer - For an amazing game!
+ Josef Drexler - For his great work on TTDPatch.
+ Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
+ Petr Baudiš (pasky) - Many patches, newgrf support, etc.
+ Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with
+ Stefan Meißner (sign_de) - For his work on the console
+ Mike Ragsdale - OpenTTD installer
+ Cian Duffy (MYOB) - BeOS port / manual writing
+ Christian Rosentreter (tokai) - MorphOS / AmigaOS port
+ Richard Kempton (RichK67) - Additional airports, initial TGP implementation
+ Alberto Demichelis - Squirrel scripting language
+ L. Peter Deutsch - MD5 implementation
+ Michael Blunck - For revolutionizing TTD with awesome graphics
+ George - Canal graphics
+ Andrew Parkhouse (andythenorth) - River graphics
+ David Dallaston (Pikka) - Tram tracks
+ All Translators - For their support to make OpenTTD a truly international game
+ Bug Reporters - Thanks for all bug reports
+ Chris Sawyer - For an amazing game!
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index d2bc2be0fb..e5694eddee 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -437,6 +437,7 @@ static const char * const _credits[] = {
" L. Peter Deutsch - MD5 implementation \xC2\xA9 1999, 2000, 2002",
" Michael Blunck - Pre-Signals and Semaphores \xC2\xA9 2003",
" George - Canal/Lock graphics \xC2\xA9 2003-2004",
+ " Andrew Parkhouse - River graphics",
" David Dallaston - Tram tracks",
" Marcin Grzegorczyk - Foundations for Tracks on Slopes",
" All Translators - Who made OpenTTD a truly international game",