diff options
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/files.h | 3 | ||||
| -rw-r--r-- | src/table/sprites.h | 70 |
2 files changed, 38 insertions, 35 deletions
diff --git a/src/table/files.h b/src/table/files.h index 662b4c121..ac6fbbd03 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -59,10 +59,11 @@ 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", { 0x85, 0x4f, 0xf6, 0xb5, 0xd2, 0xf7, 0xbc, 0x1e, 0xb9, 0xdc, 0x44, 0xef, 0x35, 0x5f, 0x64, 0x9b } }, + { "openttd.grf", { 0x20, 0x64, 0x4a, 0xf6, 0x75, 0x26, 0x5b, 0x92, 0xbb, 0x6f, 0x8d, 0x0e, 0x34, 0x7e, 0xa6, 0xe3 } }, { "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } }, { "roadstops.grf", { 0x8c, 0xd9, 0x45, 0x21, 0x28, 0x82, 0x96, 0x45, 0x33, 0x22, 0x7a, 0xb9, 0x0d, 0xf3, 0x67, 0x4a } }, { "group.grf", { 0xe8, 0x52, 0x5f, 0x1c, 0x3e, 0xf9, 0x91, 0x9d, 0x0f, 0x70, 0x8c, 0x8a, 0x21, 0xa4, 0xc7, 0x02 } }, { "tramtrkw.grf", { 0x83, 0x0a, 0xf4, 0x9f, 0x29, 0x10, 0x48, 0xfd, 0x76, 0xe9, 0xda, 0xac, 0x5d, 0xa2, 0x30, 0x45 } }, { "oneway.grf", { 0xbb, 0xc6, 0xa3, 0xb2, 0xb3, 0xa0, 0xc9, 0x3c, 0xc9, 0xee, 0x24, 0x7c, 0xb6, 0x51, 0x74, 0x63 } }, + { "flags.grf", { 0xa1, 0xd7, 0x72, 0x75, 0x0e, 0x81, 0x86, 0x0e, 0xc9, 0xcd, 0xc2, 0x57, 0xb2, 0x19, 0xe1, 0x0c } }, }; diff --git a/src/table/sprites.h b/src/table/sprites.h index 77d87d3db..777cb4261 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 = 112, // number of gfx-sprites in openttd.grf SPR_SIGNALS_BASE = 4896, SPR_CANALS_BASE = SPR_SIGNALS_BASE + 486, SPR_SLOPES_BASE = SPR_CANALS_BASE + 70, @@ -62,44 +62,43 @@ enum Sprites { SPR_PIN_DOWN = SPR_OPENTTD_BASE + 56, SPR_BOX_EMPTY = SPR_OPENTTD_BASE + 59, SPR_BOX_CHECKED = SPR_OPENTTD_BASE + 60, - SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 86, // resize icon - SPR_HOUSE_ICON = SPR_OPENTTD_BASE + 93, + SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 82, // resize icon + SPR_HOUSE_ICON = SPR_OPENTTD_BASE + 89, // arrow icons pointing in all 4 directions - SPR_ARROW_DOWN = SPR_OPENTTD_BASE + 87, - SPR_ARROW_UP = SPR_OPENTTD_BASE + 88, - SPR_ARROW_LEFT = SPR_OPENTTD_BASE + 89, - SPR_ARROW_RIGHT = SPR_OPENTTD_BASE + 90, + SPR_ARROW_DOWN = SPR_OPENTTD_BASE + 83, + SPR_ARROW_UP = SPR_OPENTTD_BASE + 84, + SPR_ARROW_LEFT = SPR_OPENTTD_BASE + 85, + SPR_ARROW_RIGHT = SPR_OPENTTD_BASE + 86, SPR_LARGE_SMALL_WINDOW = 682, /* Clone vehicles stuff */ - SPR_CLONE_TRAIN = SPR_OPENTTD_BASE + 91, - SPR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 108, - SPR_CLONE_SHIP = SPR_OPENTTD_BASE + 110, - SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 112, - - SPR_SELL_TRAIN = SPR_OPENTTD_BASE + 95, - SPR_SELL_ROADVEH = SPR_OPENTTD_BASE + 96, - SPR_SELL_SHIP = SPR_OPENTTD_BASE + 97, - SPR_SELL_AIRCRAFT = SPR_OPENTTD_BASE + 98, - SPR_SELL_ALL_TRAIN = SPR_OPENTTD_BASE + 99, - SPR_SELL_ALL_ROADVEH = SPR_OPENTTD_BASE + 100, - SPR_SELL_ALL_SHIP = SPR_OPENTTD_BASE + 101, - SPR_SELL_ALL_AIRCRAFT = SPR_OPENTTD_BASE + 102, - SPR_REPLACE_TRAIN = SPR_OPENTTD_BASE + 103, - SPR_REPLACE_ROADVEH = SPR_OPENTTD_BASE + 104, - SPR_REPLACE_SHIP = SPR_OPENTTD_BASE + 105, - SPR_REPLACE_AIRCRAFT = SPR_OPENTTD_BASE + 106, - SPR_SELL_CHAIN_TRAIN = SPR_OPENTTD_BASE + 107, - - SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 114, - - SPR_WARNING_SIGN = SPR_OPENTTD_BASE + 115, // warning sign (shown if there are any newgrf errors) + SPR_CLONE_TRAIN = SPR_OPENTTD_BASE + 87, + SPR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 104, + SPR_CLONE_SHIP = SPR_OPENTTD_BASE + 106, + SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 108, + + SPR_SELL_TRAIN = SPR_OPENTTD_BASE + 91, + SPR_SELL_ROADVEH = SPR_OPENTTD_BASE + 92, + SPR_SELL_SHIP = SPR_OPENTTD_BASE + 93, + SPR_SELL_AIRCRAFT = SPR_OPENTTD_BASE + 94, + SPR_SELL_ALL_TRAIN = SPR_OPENTTD_BASE + 95, + SPR_SELL_ALL_ROADVEH = SPR_OPENTTD_BASE + 96, + SPR_SELL_ALL_SHIP = SPR_OPENTTD_BASE + 97, + SPR_SELL_ALL_AIRCRAFT = SPR_OPENTTD_BASE + 98, + SPR_REPLACE_TRAIN = SPR_OPENTTD_BASE + 99, + SPR_REPLACE_ROADVEH = SPR_OPENTTD_BASE + 100, + SPR_REPLACE_SHIP = SPR_OPENTTD_BASE + 101, + SPR_REPLACE_AIRCRAFT = SPR_OPENTTD_BASE + 102, + SPR_SELL_CHAIN_TRAIN = SPR_OPENTTD_BASE + 103, + + SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 110, + + SPR_WARNING_SIGN = SPR_OPENTTD_BASE + 111, // warning sign (shown if there are any newgrf errors) /* Network GUI sprites */ SPR_SQUARE = SPR_OPENTTD_BASE + 20, // colored square (used for newgrf compatibility) SPR_LOCK = SPR_OPENTTD_BASE + 19, // lock icon (for password protected servers) - SPR_FLAGS_BASE = SPR_OPENTTD_BASE + 82, // start of the flags block (in same order as enum NetworkLanguage) SPR_AIRPORTX_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // The sprites used for other airport angles SPR_NEWAIRPORT_TARMAC = SPR_AIRPORTX_BASE, @@ -171,6 +170,9 @@ enum Sprites { /* One way road sprites */ SPR_ONEWAY_BASE = SPR_TRAMWAY_BASE + 113, + /* Flags sprites (in same order as enum NetworkLanguage) */ + SPR_FLAGS_BASE = SPR_ONEWAY_BASE + 6, + /* Manager face sprites */ SPR_GRADIENT = 874, // background gradient behind manager face @@ -1325,10 +1327,10 @@ enum CursorSprite { SPR_CURSOR_TRUCK_STATION = 2726, SPR_CURSOR_ROAD_TUNNEL = 2433, - SPR_CURSOR_CLONE_TRAIN = SPR_OPENTTD_BASE + 92, - SPR_CURSOR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 109, - SPR_CURSOR_CLONE_SHIP = SPR_OPENTTD_BASE + 111, - SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 113, + SPR_CURSOR_CLONE_TRAIN = SPR_OPENTTD_BASE + 88, + SPR_CURSOR_CLONE_ROADVEH = SPR_OPENTTD_BASE + 105, + SPR_CURSOR_CLONE_SHIP = SPR_OPENTTD_BASE + 107, + SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 109 }; /// Animation macro in table/animcursors.h (_animcursors[]) |