diff options
author | belugas <belugas@openttd.org> | 2006-04-24 21:10:56 +0000 |
---|---|---|
committer | belugas <belugas@openttd.org> | 2006-04-24 21:10:56 +0000 |
commit | ebf6797678b58aa558ab933fd3f5931fcf0406b9 (patch) | |
tree | d080bac8a9cda725440a23acb119e6257fe7731c /table | |
parent | 7aed9a62f2150f35b31b2ea52a4de07c1aa50ce2 (diff) | |
download | openttd-ebf6797678b58aa558ab933fd3f5931fcf0406b9.tar.xz |
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
Diffstat (limited to 'table')
-rw-r--r-- | table/build_industry.h | 16 | ||||
-rw-r--r-- | table/industry_land.h | 15 | ||||
-rw-r--r-- | table/town_land.h | 2 | ||||
-rw-r--r-- | table/unmovable_land.h | 10 |
4 files changed, 41 insertions, 2 deletions
diff --git a/table/build_industry.h b/table/build_industry.h index 44d83040f..82741b781 100644 --- a/table/build_industry.h +++ b/table/build_industry.h @@ -1,5 +1,21 @@ /* $Id$ */ + +typedef struct IndustryTileTable { + TileIndexDiffC ti; + IndustryGfx gfx; +} IndustryTileTable; + +typedef struct IndustrySpec { + const IndustryTileTable *const *table; + byte num_table; + byte a,b,c; + CargoID produced_cargo[2]; + byte production_rate[2]; + CargoID accepts_cargo[3]; + byte check_proc; +} IndustrySpec; + #define MK(x,y, m) {{x, y}, m} #define MKEND {{-0x80, 0}, 0} diff --git a/table/industry_land.h b/table/industry_land.h index 08543df1c..9844d66df 100644 --- a/table/industry_land.h +++ b/table/industry_land.h @@ -1,8 +1,21 @@ /* $Id$ */ +typedef struct DrawIndustrySpec1Struct { + byte x; + byte image_1; + byte image_2; + byte image_3; +} DrawIndustrySpec1Struct; + +typedef struct DrawIndustrySpec4Struct { + byte image_1; + byte image_2; + byte image_3; +} DrawIndustrySpec4Struct; + #define M(s1, s2, sx, sy, w, h, dz, p) { s1, s2, sx, sy, w - 1, h - 1, dz, p } -static const DrawIndustryTileStruct _industry_draw_tile_data[700] = { +static const DrawBuildingsTileStruct _industry_draw_tile_data[700] = { M( 0xf54, 0x7db, 7, 0, 9, 9, 10, 0), M( 0xf54, 0x7dc, 7, 0, 9, 9, 30, 0), M( 0xf54, 0x7dd, 7, 0, 9, 9, 30, 0), diff --git a/table/town_land.h b/table/town_land.h index 9225761fd..c9a940fb8 100644 --- a/table/town_land.h +++ b/table/town_land.h @@ -28,7 +28,7 @@ enum { */ #define M(s1, s2, sx, sy, w, h, dz, p) {s1, s2, sx, sy, w - 1, h - 1, dz, p} -static const DrawTownTileStruct _town_draw_tile_data[] = { +static const DrawBuildingsTileStruct _town_draw_tile_data[] = { M( 0xf54, 0x58d, 0, 0, 14, 14, 8, 0), M( 0xf54, 0x58e, 0, 0, 14, 14, 60, 0), M( 0xf54, 0x58f, 0, 0, 14, 14, 60, 0), diff --git a/table/unmovable_land.h b/table/unmovable_land.h index 15c226333..490c4564b 100644 --- a/table/unmovable_land.h +++ b/table/unmovable_land.h @@ -1,5 +1,15 @@ /* $Id$ */ +typedef struct DrawTileUnmovableStruct { + uint16 image; + byte subcoord_x; + byte subcoord_y; + byte width; + byte height; + byte z_size; + byte unused; +} DrawTileUnmovableStruct; + #define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 } static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = { |