From 7930faace98fea1ce02032c9cebc06e9b5266a16 Mon Sep 17 00:00:00 2001 From: darkvater Date: Sun, 14 Nov 2004 01:25:05 +0000 Subject: (svn r576) -newgrf: Cleanup horrible table/(station|unmovable)_land.h DrawTileSeqStruct hacks needed for custom station supports (pasky) --- table/unmovable_land.h | 126 ++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 74 deletions(-) (limited to 'table/unmovable_land.h') diff --git a/table/unmovable_land.h b/table/unmovable_land.h index 5c31e53b4..7cedafbf3 100644 --- a/table/unmovable_land.h +++ b/table/unmovable_land.h @@ -1,141 +1,119 @@ -#define TILE_SEQ_BEGIN(x) ADD_WORD(x), -#define TILE_SEQ_LINE(a,b,c,d,e,f,g) a,b,c,d,e,f,ADD_WORD(g), -#define TILE_SEQ_END() 0x80 +#define TILE_SEQ_END() { 0x80 } static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = { {0xA29, 7,7, 2,2, 70}, {0xA2A, 4,4, 7,7, 61}, }; -static const byte _unmovable_display_datas_0[] = { - TILE_SEQ_BEGIN(0x8A2B) + +static const DrawTileSeqStruct _unmovable_display_datas_0[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_1[] = { - TILE_SEQ_BEGIN(0x8A2C) +static const DrawTileSeqStruct _unmovable_display_datas_1[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_2[] = { - TILE_SEQ_BEGIN(0x8A2D) +static const DrawTileSeqStruct _unmovable_display_datas_2[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_3[] = { - TILE_SEQ_BEGIN(0x8A2E) +static const DrawTileSeqStruct _unmovable_display_datas_3[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_4[] = { - TILE_SEQ_BEGIN(0x8A2F) +static const DrawTileSeqStruct _unmovable_display_datas_4[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_5[] = { - TILE_SEQ_BEGIN(0x8A30) +static const DrawTileSeqStruct _unmovable_display_datas_5[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_6[] = { - TILE_SEQ_BEGIN(0x8A31) +static const DrawTileSeqStruct _unmovable_display_datas_6[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_7[] = { - TILE_SEQ_BEGIN(0x8A32) +static const DrawTileSeqStruct _unmovable_display_datas_7[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_8[] = { - TILE_SEQ_BEGIN(0x8A33) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 20, 0x8A34) +static const DrawTileSeqStruct _unmovable_display_datas_8[] = { + { 0, 0, 0, 16, 16, 20, 0x8A34 }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_9[] = { - TILE_SEQ_BEGIN(0x8A35) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 20, 0x8A36) +static const DrawTileSeqStruct _unmovable_display_datas_9[] = { + { 0, 0, 0, 16, 16, 20, 0x8A36 }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_10[] = { - TILE_SEQ_BEGIN(0x8A37) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 20, 0x8A38) +static const DrawTileSeqStruct _unmovable_display_datas_10[] = { + { 0, 0, 0, 16, 16, 20, 0x8A38 }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_11[] = { - TILE_SEQ_BEGIN(0x8A39) +static const DrawTileSeqStruct _unmovable_display_datas_11[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_12[] = { - TILE_SEQ_BEGIN(0x8A3A) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 50, 0x8A3B) +static const DrawTileSeqStruct _unmovable_display_datas_12[] = { + { 0, 0, 0, 16, 16, 50, 0x8A3B }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_13[] = { - TILE_SEQ_BEGIN(0x8A3C) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 50, 0x8A3D) +static const DrawTileSeqStruct _unmovable_display_datas_13[] = { + { 0, 0, 0, 16, 16, 50, 0x8A3D }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_14[] = { - TILE_SEQ_BEGIN(0x8A3E) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 50, 0x8A3F) +static const DrawTileSeqStruct _unmovable_display_datas_14[] = { + { 0, 0, 0, 16, 16, 50, 0x8A3F }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_15[] = { - TILE_SEQ_BEGIN(0x8A40) +static const DrawTileSeqStruct _unmovable_display_datas_15[] = { TILE_SEQ_END() }; -static const byte _unmovable_display_datas_16[] = { - TILE_SEQ_BEGIN(0x8A41) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 60, 0x8A42) +static const DrawTileSeqStruct _unmovable_display_datas_16[] = { + { 0, 0, 0, 16, 16, 60, 0x8A42 }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_17[] = { - TILE_SEQ_BEGIN(0x8A43) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 60, 0x8A44) +static const DrawTileSeqStruct _unmovable_display_datas_17[] = { + { 0, 0, 0, 16, 16, 60, 0x8A44 }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_18[] = { - TILE_SEQ_BEGIN(0x8A45) - TILE_SEQ_LINE( 0, 0, 0, 16, 16, 60, 0x8A46) +static const DrawTileSeqStruct _unmovable_display_datas_18[] = { + { 0, 0, 0, 16, 16, 60, 0x8A46 }, TILE_SEQ_END() }; -static const byte _unmovable_display_datas_19[] = { - TILE_SEQ_BEGIN(0x8A47) +static const DrawTileSeqStruct _unmovable_display_datas_19[] = { TILE_SEQ_END() }; -static const byte * const _unmovable_display_datas[] = { - _unmovable_display_datas_0, - _unmovable_display_datas_1, - _unmovable_display_datas_2, - _unmovable_display_datas_3, - _unmovable_display_datas_4, - _unmovable_display_datas_5, - _unmovable_display_datas_6, - _unmovable_display_datas_7, - _unmovable_display_datas_8, - _unmovable_display_datas_9, - _unmovable_display_datas_10, - _unmovable_display_datas_11, - _unmovable_display_datas_12, - _unmovable_display_datas_13, - _unmovable_display_datas_14, - _unmovable_display_datas_15, - _unmovable_display_datas_16, - _unmovable_display_datas_17, - _unmovable_display_datas_18, - _unmovable_display_datas_19, +static const DrawTileSprites _unmovable_display_datas[] = { + { 0x8A2B, _unmovable_display_datas_0 }, + { 0x8A2C, _unmovable_display_datas_1 }, + { 0x8A2D, _unmovable_display_datas_2 }, + { 0x8A2E, _unmovable_display_datas_3 }, + { 0x8A2F, _unmovable_display_datas_4 }, + { 0x8A30, _unmovable_display_datas_5 }, + { 0x8A31, _unmovable_display_datas_6 }, + { 0x8A32, _unmovable_display_datas_7 }, + { 0x8A33, _unmovable_display_datas_8 }, + { 0x8A35, _unmovable_display_datas_9 }, + { 0x8A37, _unmovable_display_datas_10 }, + { 0x8A39, _unmovable_display_datas_11 }, + { 0x8A3A, _unmovable_display_datas_12 }, + { 0x8A3C, _unmovable_display_datas_13 }, + { 0x8A3E, _unmovable_display_datas_14 }, + { 0x8A40, _unmovable_display_datas_15 }, + { 0x8A41, _unmovable_display_datas_16 }, + { 0x8A43, _unmovable_display_datas_17 }, + { 0x8A45, _unmovable_display_datas_18 }, + { 0x8A47, _unmovable_display_datas_19 }, }; - -- cgit v1.2.3-70-g09d2