From 39f61734011f4e27fe1ad36dbbbc9e9dbd002ac3 Mon Sep 17 00:00:00 2001 From: peter1138 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 zcmYMyZ)h839Ki8BcbB{Kk`$fA(NT&88%9yzm|RzwxYpT$D0KOQU|y`uKWKCG#m;Or z1>>Izceym@t2$+xkPgj8Vc8t^*7_%VG05hSi{eb@AD*^YpSx5#vDdq6Smq^C{lUY- z^SpRod_Rx=Q5P(9y)_M{v1xpoxa>Zofb_!0ihD>*od%$@)72W>SqS&KA{=j+J7$9C zqLn?)kxv*6%QSf|R(_BQbG&KV2J(Zj;zxs+)qs9wka9)&glQW2L7&SNi*v?Z+v4Kk zkg^{paKp6GaS$)PgbvaTqhZ=sf>$K;BsxV{J1Nu5_oEryZrW(LBomQ1XQ88*ZKAW~ zIU>sO7Rur~rh%@g--0L{MSX_-DUJbi@V|>Cgkbqg17P%hA_yp`l7cs*^ z&sQf$?*osrAACoV-6_=zd9Wq&D%MqmIPz!+NKlqq+Ik6{>ut0ckD zG>veKrd1yxg@VAA15BjV&Tu-0;Q@gy{tkRa4yR*r6eMlaaPrnBfm`e-vA|m#XZ}a1 z%?X9nxua-H$&vqBpgf2PHSz5t3uyQQ-tri){iyW;O6(B0l_N0Mav4{1;$fk1HA%E^ zmY=HR#H4umYDqgp@A?Q_`h^dZD?`B0PT@QkFHbnnmTvceFe?0KRk@w+PKoPR*0iS` zFw-ngq(kERxv92UQ4fhp>521Sx8?LvJ%lCrv>?59e#=d_`1GX~pH^QL(_2!1B?xQ! zQk$@PMCzX#106R;!M>ICT}f>u9m;rsug0QJwBcRQ<$8`(GZT;n9yn18uJyrJv^D1sYy_6Zq*;~4m=smZ&8zdbq?=B2rV>Q+ z=z>ZXy*R~CGncAlIfxSk(V{PTF}HJd_DuD;ES=qZ%Z~x@6)gm_Bc}t1y#}u<**CK9 zs)0`*5(cuL=L3ryzdi=s*@M{)C9tl1@y^W4a&IZ{%_Ex+tor3=MdGs;^8>}ML$dTf zD@No6@q`c+6!~v)So~7fWn0`MJ}lpn?_GRT(B;46dpCN-9(hx4E~dp$d*7C!y!lge K;kO|&F7M3lnb9OLxY@fS>)vz3c+6R-gW0)5VSc3_H zj}#BttB^1%8iWELEj-&6<^>3K1NVS%z6bXcS_Spw``a85ApxP0>1P~{Xq-2YuJQ43 zD9@qEzv<`I_f|P2^MWd^K4;0SxmzDe&>anEh`~>jYuE z@E>7OOC6OqS2oPoZAJ(SW2um|d1b04nYBXFr2O*L+bvIP$O;h&AtlNmUEOuDO;l^G ziE7qsNh!4}_ZEYwY^}9qOQ+=C#ZlmUFa(ZNHxGc#!Bl9*3z#y8zcmLAoZ%bt+{_7m zlwhOvS?h}?cR#4q&-_x5AErct3Zsv$9qVZI=@LCd7}x4;MAyj1DDc)+?JV@F)q%#7 zt9x?q)*qyo>Oy^hK|wd$YJ_>tZbW_V#@@^r;(!;8m4h4I=mT@ZuEthiZB(99IfC++ z=aEr3Gd|)&G!)LSaEB;*I&hy*P z)OwURCFl3=X8N)niu@%f4J*sixEK-h%HPs}^rK=a|44_VE@ek)T)!Y%%3n(3L8sKI bY%BY#DJj&t_Y|aTukZUD%NGaS7rg%hlrt9> 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)