From 39f61734011f4e27fe1ad36dbbbc9e9dbd002ac3 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Tue, 22 Jan 2008 20:04:30 +0000
Subject: [PATCH] (svn r11949) -Codechange: add river icon and cursor, drawn by
 skidd13.

---
 bin/data/openttdd.grf | Bin 413034 -> 414048 bytes
 bin/data/openttdw.grf | Bin 413182 -> 414196 bytes
 src/table/files.h     |   4 ++--
 src/table/sprites.h   |   4 +++-
 src/terraform_gui.cpp |   4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf
index 58be8d92ac1db102521eb418ea67061a5954f0be..cc953deb44e29c3401beab5f68c6749bf24c79df 100644
GIT binary patch
delta 1033
zcmaDgOY*@Y$%Yoj7N!>F7M3lnb9OLxZJ)b?)v>dF1|y@02m=T(GcYi`VCG>6$tnK&
z{nz)>;+)VELOcv1#id_=|M>pBI4AmmFne%L@%QgPzrIjo4Bnyk!jkF7?+0o-EZG@C
zi%Y+M|GL1Emw_QVJLl`)pFeW4gM)TxJSb)U`u*pNB*yFw$uDd;et-S_{pXL;;vL;D
zY+sbK{P<P>{rdu~7ro3s|NVU7w4t9RBs=HFi$JEI-(M^_u$Uz@r})Q<KIUKFzrNUc
z;WT6DgMb&REI)q#EWS|96fE^%3;XY%f4_hI`SU^*Q)teMGWM@ue}4b*{ojd7#^{#}
zFWxeJ{q;he>G#*0Y>dGVR9}j`IPoCuM$&_L=C42hy*T<n?_w~kVsvrokFPH}n11|t
z8FDh1skrok;){(;Uw^#ty;vE*$*5yC{Tw@+O#KBOM&1|99K1X{JUraoTpeZ`%uZ-*
zFn!_nz~qGm6BkEE&W>tUK3*;^t{2P~*jTtYI5=J~GjVWS;ALd%Skz&5z=SIV6n0;~
z7v}^&u;?&b@syEwMGiAZboL8Vwx8d>7Ux9YsAOdA<lA7z$g?7g3lRx77I!SFUm5t~
z%Z~YMkhplUfHAt`MrY#+Ge(XFmzhEFk#*zhOI1epPQH$uhwcyNgW@IY!u(E`jztHn
zSU{0;)BeQ#&Z<tAgBxBtaKPfHBd05TX4OMS#;-5SnTvC>59D>+=-hBijxqSfB6wV#
zxYZ?7-}!9k<Co4XKYo4xeju+asPoy%YH*ybcoo!H)or|LA2{Y-1-uGkDlP8n=+0R6
zg_Q#oeXn+dqVMJFN1a_?y0uQ2KDhB}H#iC}x_4_WPGICa6~HL<@EI&7U%GV#^>8!t
z-Y|PH@1+wgLT}c)c2DbZyq&<r5&gRNRVyfBEg65mj=yxE`%G5{6Ibwq%vT>?$vhOe
z$kW4gXZ>q-CN`GG35?v2c0HKS^z+{<$p=NdzIAK8dCttu#rD9Qk@tZq8wWV*UzRcb
z`0;w$rf)rY56l?3ALQLIeXRN*_2pxxuRq?H>`v&OcEOB^tDgPF{52QWT<bow!i<sY
zgz1YlFV<gRTfxK3&c)ul=_1<!Q)U(x7Esi0;9+8A@7=Uy&PAU-jy~~gYD|obdpSBx
z``l)jyf8cZ;N*_JlD_5(Cd<S+%=<PkFxmCyt}Y{MpH1JJ9VX9qY-{RG=~vufvR~!B
z;3KtuuTGZbQ47phNILX)PcZ8Y>EGU2)DhaTqyKZKQ|F%kSN%Ubg*p}bKlK0KSl98Y
k|6~9EQ*xbh{qOt#?ds|b0@L66AN0S!{%`v|N46er0IVJv%K!iX

delta 33
pcmaE`Nb=Pz$%Yoj7N!>F7M3lnb9OLxY@fS>)v<H?6<4+%ZUFI34Y2?K

diff --git a/bin/data/openttdw.grf b/bin/data/openttdw.grf
index 268e5df498d2d9eb204cbd905581be2d66f95c7a..c08f593bbd31f2dee4ba08bfb7a7e5dda0488e64 100644
GIT binary patch
delta 1057
zcmex2Tk^|d$%Yoj7N!>F7M3ln+&dY&w)5;{E$XbF!N@2g!T<uy3=9k}n0XjNa*FTV
zd~~z4I4AUk5D!C0ap|3Vw{G4n&WS!C%pROmeDmh*J1^82gLkOCuw=S*?}6G5OLm6P
z;?kQp?<}z7WnhTT&bjm8_N|=k;Gi8E4@#Nu+`RoFi7|Ua@(UY|dw1^LynU;*ct`gO
z+ZW|5w;t8sytzQ@MKAO1hqqriZRlqS$<Dd;B9Q6!%@<1!EM^JKDZcfhkNMHfJ1=%#
zIL#RPAmD{6%dLC2i!W3&1xr2H!hY}egPV75-@Z`A6q@s*jQ!4?+c$6Be0ZXgG5RIL
zi?>X79=#A}x_9R$8)NVT)t4eKPCQ7vk@O&*`OfW!FOELYyBN$`A6;B}>&}Y~rdzjO
zhMWv$DlUDX_+lf|om($_FIEO{GU}KyeE5I&KO}4}ur1)>`Tw7fkC&H+mzR(4{{<dK
z-WSXqygWQSJlxz|9cCNMPH1c}ec|@N<b?$jmqtg<j%rpuUM?=K7t9yfShzGaG+r<>
zX=q&FWmM=`)M0kOq@F7T6r^`<7Uu*%u;?&b@syEwMGmt@boL8Vw%a%F6z4?WsASCQ
z<lA7z$g?7g3lTRr7I!RK8TjJMj`?hm7<#dQF}mYMXX6SpMvVuTnL)9Xb>r$wRYt{5
zzK)!S?hodJVk_&y{7#pSMF*=`z)@Cje`0=TRj13r4KE!yVA0l*(-l6m>Y*d!otNdz
z#W~pr@;YvGZn!1K82n-pJPJ?T>XPYvw)62zXO>%!Zr(hQ*A>+HY-Ke#CRe-)>a6NE
zUbPP#pRWR51u>NtcXf1Utop*L0gBXDyFroq^7W(o&aN-rS|>~&+<3Jc9J3eQyR{Z4
zF!G%WV3d0J3>LvJ-MWH$xEXnGn7x?y(g_yNH(k4@^*G*6VA6<w-TSH)6y27L_g=?e
zI?#QltAmLv_(A5Y53gh%3S8vrVY;*aH9M0+#Nz};?nk>G%xAj&@Rj6)qWWFmy0zXs
zXXfTocwo-R`@ob<1DqmWmNDJB^?KT-Z#{Vr%ow>J<lQiRtok7J<zuEhx89iSPUxO?
z!HkJZ@y7f$7uH<sKC{A%k?Vx%i#0FSUtn9o!>q`q*t_W>+W}MNh=>SK)NkNn%2Mpz
zv}DdjpFWO0@oQ>K*RSv8=rHZ8cbj4I!tCgSlRNrK`kF78EEDT6@7uh<WY?R!x{O(U
zHhph)m^|CDt*JMqUvY!UewFuvkJS3TI$4%SEihjp+21|EtTUv4duLHcXvdEJ&z(-4
zd-`AX|Lhd%ROtWE|9@j$$E*I2{r^wNb;|X>@Bg=}t1}2pf9rqH|Ni<vK8EcLPHc7D
E0F*Nq7XSbN

delta 33
pcmeyeSn}U&$%Yoj7N!>F7M3ln+&dXNw)5;{E$ZA};>Om%4FKlY41oXu

diff --git a/src/table/files.h b/src/table/files.h
index 39cecb368f..78e71227e7 100644
--- a/src/table/files.h
+++ b/src/table/files.h
@@ -33,7 +33,7 @@ static FileList files_dos = {
 		{ "TRGT.GRF",      {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} }
 	},
 	{ "SAMPLE.CAT",    {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} },
-	{ "OPENTTDD.GRF",  {0xe0, 0x81, 0x09, 0xb3, 0xb0, 0x05, 0xc0, 0xfa, 0xf8, 0x03, 0xb9, 0xed, 0xb5, 0x5d, 0xa5, 0xc7} }
+	{ "OPENTTDD.GRF",  {0x2c, 0x3a, 0x86, 0x3b, 0xe0, 0x42, 0xb1, 0x65, 0xba, 0x59, 0xcb, 0x99, 0x9c, 0x3f, 0xe5, 0x3e} }
 };
 
 static FileList files_win = {
@@ -46,5 +46,5 @@ static FileList files_win = {
 		{ "TRGTR.GRF",     {0xde, 0x53, 0x65, 0x05, 0x17, 0xfe, 0x66, 0x1c, 0xea, 0xa3, 0x13, 0x8c, 0x6e, 0xdb, 0x0e, 0xb8} }
 	},
 	{ "SAMPLE.CAT",    {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} },
-	{ "OPENTTDW.GRF",  {0xeb, 0xec, 0x73, 0xe9, 0x47, 0x50, 0xbc, 0xb5, 0x37, 0x1d, 0xf6, 0x5a, 0x26, 0x76, 0x99, 0x83} }
+	{ "OPENTTDW.GRF",  {0x1d, 0x9b, 0x03, 0x5e, 0x5d, 0x87, 0xef, 0x21, 0x0f, 0xe3, 0x6e, 0x6d, 0x12, 0xa1, 0x85, 0xfb} }
 };
diff --git a/src/table/sprites.h b/src/table/sprites.h
index ec26e1d485..842d945421 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -49,7 +49,7 @@ enum Sprites {
 
 	/* Extra graphic spritenumbers */
 	SPR_OPENTTD_BASE     = 4896,
-	OPENTTD_SPRITE_COUNT = 136,
+	OPENTTD_SPRITE_COUNT = 138,
 
 	/* Halftile-selection sprites */
 	SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE,
@@ -1017,6 +1017,7 @@ enum Sprites {
 	SPR_IMG_TRANSMITTER     = 4086,
 	SPR_IMG_LEVEL_LAND      = SPR_OPENTTD_BASE + 91,
 	SPR_IMG_BUILD_CANAL     = SPR_OPENTTD_BASE + 88,
+	SPR_IMG_BUILD_RIVER     = SPR_OPENTTD_BASE + 136,
 	SPR_IMG_BUILD_LOCK      = SPR_CANALS_BASE + 64,
 	SPR_IMG_PAUSE           = 726,
 	SPR_IMG_FASTFORWARD     = SPR_OPENTTD_BASE + 90,
@@ -1319,6 +1320,7 @@ enum CursorSprite {
 	SPR_CURSOR_DOCK           = 3668,
 	SPR_CURSOR_CANAL          = SPR_OPENTTD_BASE + 89,
 	SPR_CURSOR_LOCK           = SPR_OPENTTD_BASE + 87,
+	SPR_CURSOR_RIVER          = SPR_OPENTTD_BASE + 137,
 
 	/* shared road & rail cursors */
 	SPR_CURSOR_BRIDGE         = 2593,
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 7569f10a77..5981c27c85 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -430,7 +430,7 @@ static const Widget _scen_edit_land_gen_widgets[] = {
 {    WWT_IMGBTN,   RESIZE_NONE,    14,    46,    67,    16,    37, SPR_IMG_TERRAFORM_UP,      STR_018F_RAISE_A_CORNER_OF_LAND},
 {    WWT_IMGBTN,   RESIZE_NONE,    14,    68,    89,    16,    37, SPR_IMG_LEVEL_LAND,        STR_LEVEL_LAND_TOOLTIP},
 {    WWT_IMGBTN,   RESIZE_NONE,    14,    90,   111,    16,    37, SPR_IMG_BUILD_CANAL,       STR_CREATE_LAKE},
-{    WWT_IMGBTN,   RESIZE_NONE,    14,   112,   133,    16,    37, SPR_IMG_BUILD_CANAL,       STR_CREATE_RIVER},
+{    WWT_IMGBTN,   RESIZE_NONE,    14,   112,   133,    16,    37, SPR_IMG_BUILD_RIVER,       STR_CREATE_RIVER},
 {    WWT_IMGBTN,   RESIZE_NONE,    14,   134,   156,    16,    37, SPR_IMG_ROCKS,             STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
 {    WWT_IMGBTN,   RESIZE_NONE,    14,   157,   179,    16,    37, SPR_IMG_LIGHTHOUSE_DESERT, STR_NULL}, // XXX - dynamic
 {    WWT_IMGBTN,   RESIZE_NONE,    14,   180,   201,    16,    37, SPR_IMG_TRANSMITTER,       STR_028E_PLACE_TRANSMITTER},
@@ -483,7 +483,7 @@ static void EditorTerraformClick_WaterArea(Window *w)
 
 static void EditorTerraformClick_RiverArea(Window *w)
 {
-	HandlePlacePushButton(w, 9, SPR_CURSOR_CANAL, VHM_RECT, PlaceProc_RiverArea);
+	HandlePlacePushButton(w, 9, SPR_CURSOR_RIVER, VHM_RECT, PlaceProc_RiverArea);
 }
 
 static void EditorTerraformClick_RockyArea(Window *w)