dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r8275) -Fix

Browse Source 
Factor common data tables and use a bit more sensible names
This commit is contained in:
tron
2007-01-19 06:08:04 +00:00
parent 53457d1acb
commit 659adc7c42
3 changed files with 66 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/table/road_land.h
View File

@@ -46,15 +46,8 @@ static const SpriteID _road_tile_sprites_1[16] = {
#define MAKELINE(a, b, c) { a, b, c },
#define ENDLINE { 0, 0, 0 }
static const DrawRoadTileStruct _road_display_datas2_0[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_1[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_2[] = {
static const DrawRoadTileStruct _roadside_nothing[] = {
ENDLINE
};
@@ -63,10 +56,6 @@ static const DrawRoadTileStruct _road_display_datas2_3[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_4[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_5[] = {
MAKELINE(0x57f, 1, 8)
MAKELINE(0x57e, 14, 8)
@@ -83,10 +72,6 @@ static const DrawRoadTileStruct _road_display_datas2_7[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_8[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_9[] = {
MAKELINE(0x57f, 8, 14)
ENDLINE
@@ -118,22 +103,6 @@ static const DrawRoadTileStruct _road_display_datas2_14[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_15[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_16[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_17[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_18[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_19[] = {
MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212, 3, 9)
@@ -141,10 +110,6 @@ static const DrawRoadTileStruct _road_display_datas2_19[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_20[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_21[] = {
MAKELINE(0x1212, 0, 2)
MAKELINE(0x1212, 0, 10)
@@ -166,10 +131,6 @@ static const DrawRoadTileStruct _road_display_datas2_23[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_24[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_25[] = {
MAKELINE(0x1212, 12, 2)
MAKELINE(0x1212, 9, 9)
@@ -210,72 +171,64 @@ static const DrawRoadTileStruct _road_display_datas2_30[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_31[] = {
ENDLINE
};
static const DrawRoadTileStruct _road_display_datas2_32[] = {
ENDLINE
};
#undef MAKELINE
#undef ENDLINE
static const DrawRoadTileStruct* const _road_display_table_1[] = {
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
_road_display_datas2_32,_road_display_datas2_32,
static const DrawRoadTileStruct* const _roadside_none[] = {
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing,
_roadside_nothing, _roadside_nothing
};
static const DrawRoadTileStruct* const _road_display_table_2[] = {
_road_display_datas2_0,
_road_display_datas2_1,
_road_display_datas2_2,
static const DrawRoadTileStruct* const _roadside_lamps[] = {
_roadside_nothing,
_roadside_nothing,
_roadside_nothing,
_road_display_datas2_3,
_road_display_datas2_4,
_roadside_nothing,
_road_display_datas2_5,
_road_display_datas2_6,
_road_display_datas2_7,
_road_display_datas2_8,
_roadside_nothing,
_road_display_datas2_9,
_road_display_datas2_10,
_road_display_datas2_11,
_road_display_datas2_12,
_road_display_datas2_13,
_road_display_datas2_14,
_road_display_datas2_15,
_roadside_nothing,
};
static const DrawRoadTileStruct* const _road_display_table_3[] = {
_road_display_datas2_16,
_road_display_datas2_17,
_road_display_datas2_18,
static const DrawRoadTileStruct* const _roadside_trees[] = {
_roadside_nothing,
_roadside_nothing,
_roadside_nothing,
_road_display_datas2_19,
_road_display_datas2_20,
_roadside_nothing,
_road_display_datas2_21,
_road_display_datas2_22,
_road_display_datas2_23,
_road_display_datas2_24,
_roadside_nothing,
_road_display_datas2_25,
_road_display_datas2_26,
_road_display_datas2_27,
_road_display_datas2_28,
_road_display_datas2_29,
_road_display_datas2_30,
_road_display_datas2_31,
_roadside_nothing,
};
static const DrawRoadTileStruct* const * const _road_display_table[] = {
_road_display_table_1,
_road_display_table_1,
_road_display_table_1,
_road_display_table_2,
_road_display_table_1,
_road_display_table_3,
_roadside_none,
_roadside_none,
_roadside_none,
_roadside_lamps,
_roadside_none,
_roadside_trees,
};