diff options
| -rw-r--r-- | bin/data/openttd.grf | bin | 31847 -> 34441 bytes | |||
| -rw-r--r-- | src/gfxinit.cpp | 2 | ||||
| -rw-r--r-- | src/railtypes.h | 12 | ||||
| -rw-r--r-- | src/table/files.h | 2 | ||||
| -rw-r--r-- | src/table/sprites.h | 8 |
5 files changed, 15 insertions, 9 deletions
diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf Binary files differindex 627c602bc..7dce5a2d3 100644 --- a/bin/data/openttd.grf +++ b/bin/data/openttd.grf diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index b1f22fe3a..a04402bc3 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -324,7 +324,7 @@ static const SpriteID _openttd_grf_indexes[] = { 377, 377, ///< · small 153, 153, ///< · medium 601, 601, ///< · large - SPR_WARNING_SIGN, SPR_CURSOR_AUTOTRAM, + SPR_WARNING_SIGN, SPR_CURSOR_ELRAIL_DEPOT, END }; diff --git a/src/railtypes.h b/src/railtypes.h index 6695a661c..d456d66ac 100644 --- a/src/railtypes.h +++ b/src/railtypes.h @@ -73,10 +73,10 @@ RailtypeInfo _railtypes[] = { SPR_BUILD_X_ELRAIL, SPR_BUILD_EW_ELRAIL, SPR_BUILD_Y_ELRAIL, - SPR_OPENTTD_BASE + 0, - 0x50E, + SPR_IMG_AUTOELRAIL, + SPR_IMG_DEPOT_ELRAIL, SPR_BUILD_TUNNEL_ELRAIL, - SPR_IMG_CONVERT_RAIL + SPR_IMG_CONVERT_ELRAIL }, { @@ -84,10 +84,10 @@ RailtypeInfo _railtypes[] = { SPR_CURSOR_SWNE_ELRAIL, SPR_CURSOR_EW_ELRAIL, SPR_CURSOR_NWSE_ELRAIL, - SPR_CURSOR_AUTORAIL, - SPR_CURSOR_RAIL_DEPOT, + SPR_CURSOR_AUTOELRAIL, + SPR_CURSOR_ELRAIL_DEPOT, SPR_CURSOR_TUNNEL_ELRAIL, - SPR_CURSOR_CONVERT_RAIL + SPR_CURSOR_CONVERT_ELRAIL }, /* strings */ diff --git a/src/table/files.h b/src/table/files.h index 40b2645f8..8ece00735 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -59,7 +59,7 @@ static MD5File files_openttd[] = { { "autorail.grf", { 0xed, 0x44, 0x7f, 0xbb, 0x19, 0x44, 0x48, 0x4c, 0x07, 0x8a, 0xb1, 0xc1, 0x5c, 0x12, 0x3a, 0x60 } }, { "canalsw.grf", { 0x13, 0x9c, 0x98, 0xcf, 0xb8, 0x7c, 0xd7, 0x1f, 0xca, 0x34, 0xa5, 0x6b, 0x65, 0x31, 0xec, 0x0f } }, { "elrailsw.grf", { 0x4f, 0xf9, 0xac, 0x79, 0x50, 0x28, 0x9b, 0xe2, 0x15, 0x30, 0xa8, 0x1e, 0xd5, 0xfd, 0xe1, 0xda } }, - { "openttd.grf", { 0x95, 0xe3, 0x09, 0xe4, 0x2c, 0x2d, 0x47, 0x80, 0xd2, 0x09, 0x06, 0x64, 0xaf, 0x20, 0x32, 0x14 } }, + { "openttd.grf", { 0x16, 0x5c, 0x0f, 0xba, 0x63, 0x6a, 0x77, 0x30, 0x44, 0xb0, 0x32, 0xe6, 0x4a, 0xc7, 0x90, 0x58 } }, { "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } }, { "roadstops.grf", { 0xa1, 0x5b, 0xb3, 0x52, 0x60, 0x12, 0x3c, 0xb7, 0x7b, 0x73, 0x09, 0xc1, 0x1a, 0xb4, 0xd0, 0xb8 } }, { "group.grf", { 0xe8, 0x52, 0x5f, 0x1c, 0x3e, 0xf9, 0x91, 0x9d, 0x0f, 0x70, 0x8c, 0x8a, 0x21, 0xa4, 0xc7, 0x02 } }, diff --git a/src/table/sprites.h b/src/table/sprites.h index 9caff36f2..39fee27b8 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -47,7 +47,7 @@ enum Sprites { SPR_ASCII_SPACE_BIG = 450, /* Extra graphic spritenumbers */ - OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf + OPENTTD_SPRITES_COUNT = 122, // number of gfx-sprites in openttd.grf SPR_SIGNALS_BASE = 4896, SPR_CANALS_BASE = SPR_SIGNALS_BASE + 486, @@ -1242,12 +1242,14 @@ enum Sprites { SPR_IMG_RAIL_EW = 1253, SPR_IMG_RAIL_NW = 1254, SPR_IMG_AUTORAIL = SPR_OPENTTD_BASE + 0, + SPR_IMG_AUTOELRAIL = SPR_OPENTTD_BASE + 116, SPR_IMG_AUTOMONO = SPR_OPENTTD_BASE + 1, SPR_IMG_AUTOMAGLEV = SPR_OPENTTD_BASE + 2, SPR_IMG_WAYPOINT = SPR_OPENTTD_BASE + 3, SPR_IMG_DEPOT_RAIL = 1294, + SPR_IMG_DEPOT_ELRAIL = SPR_OPENTTD_BASE + 120, SPR_IMG_DEPOT_MONO = SPR_OPENTTD_BASE + 9, SPR_IMG_DEPOT_MAGLEV = SPR_OPENTTD_BASE + 10, @@ -1259,6 +1261,7 @@ enum Sprites { SPR_IMG_TUNNEL_MAGLEV = 2432, SPR_IMG_CONVERT_RAIL = SPR_OPENTTD_BASE + 22, + SPR_IMG_CONVERT_ELRAIL = SPR_OPENTTD_BASE + 118, SPR_IMG_CONVERT_MONO = SPR_OPENTTD_BASE + 24, SPR_IMG_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 26, @@ -1335,16 +1338,19 @@ enum CursorSprite { SPR_CURSOR_TUNNEL_MAGLEV = 2436, SPR_CURSOR_AUTORAIL = SPR_OPENTTD_BASE + 4, + SPR_CURSOR_AUTOELRAIL = SPR_OPENTTD_BASE + 117, SPR_CURSOR_AUTOMONO = SPR_OPENTTD_BASE + 5, SPR_CURSOR_AUTOMAGLEV = SPR_OPENTTD_BASE + 6, SPR_CURSOR_WAYPOINT = SPR_OPENTTD_BASE + 7, SPR_CURSOR_RAIL_DEPOT = 1296, + SPR_CURSOR_ELRAIL_DEPOT = SPR_OPENTTD_BASE + 121, SPR_CURSOR_MONO_DEPOT = SPR_OPENTTD_BASE + 11, SPR_CURSOR_MAGLEV_DEPOT = SPR_OPENTTD_BASE + 12, SPR_CURSOR_CONVERT_RAIL = SPR_OPENTTD_BASE + 23, + SPR_CURSOR_CONVERT_ELRAIL = SPR_OPENTTD_BASE + 119, SPR_CURSOR_CONVERT_MONO = SPR_OPENTTD_BASE + 25, SPR_CURSOR_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 27, |