diff options
| -rw-r--r-- | bin/data/openttdd.grf | bin | 413034 -> 414048 bytes | |||
| -rw-r--r-- | bin/data/openttdw.grf | bin | 413182 -> 414196 bytes | |||
| -rw-r--r-- | src/table/files.h | 4 | ||||
| -rw-r--r-- | src/table/sprites.h | 4 | ||||
| -rw-r--r-- | src/terraform_gui.cpp | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf Binary files differindex 58be8d92a..cc953deb4 100644 --- a/bin/data/openttdd.grf +++ b/bin/data/openttdd.grf diff --git a/bin/data/openttdw.grf b/bin/data/openttdw.grf Binary files differindex 268e5df49..c08f593bb 100644 --- a/bin/data/openttdw.grf +++ b/bin/data/openttdw.grf diff --git a/src/table/files.h b/src/table/files.h index 39cecb368..78e71227e 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 ec26e1d48..842d94542 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 7569f10a7..5981c27c8 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) |