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

(svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder

Browse Source
This commit is contained in:
rubidium
2014-09-27 10:43:59 +00:00
parent 550cd50382
commit f192045796
2 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/smallmap_gui.cpp
View File

@@ -248,68 +248,7 @@ static const LegendAndColour * const _legend_table[] = {
#define MKCOLOUR_F00F MKCOLOUR_X00X(0xFF)
#define MKCOLOUR_FFFF MKCOLOUR_XXXX(0xFF)
/** Height map colours for the green colour scheme, ordered by height. */
static const uint32 _green_map_heights[] = {
MKCOLOUR_XXXX(0x5A),
MKCOLOUR_XYXY(0x5A, 0x5B),
MKCOLOUR_XXXX(0x5B),
MKCOLOUR_XYXY(0x5B, 0x5C),
MKCOLOUR_XXXX(0x5C),
MKCOLOUR_XYXY(0x5C, 0x5D),
MKCOLOUR_XXXX(0x5D),
MKCOLOUR_XYXY(0x5D, 0x5E),
MKCOLOUR_XXXX(0x5E),
MKCOLOUR_XYXY(0x5E, 0x5F),
MKCOLOUR_XXXX(0x5F),
MKCOLOUR_XYXY(0x5F, 0x1F),
MKCOLOUR_XXXX(0x1F),
MKCOLOUR_XYXY(0x1F, 0x27),
MKCOLOUR_XXXX(0x27),
MKCOLOUR_XXXX(0x27),
};
assert_compile(lengthof(_green_map_heights) == MAX_TILE_HEIGHT + 1);
/** Height map colours for the dark green colour scheme, ordered by height. */
static const uint32 _dark_green_map_heights[] = {
MKCOLOUR_XXXX(0x60),
MKCOLOUR_XYXY(0x60, 0x61),
MKCOLOUR_XXXX(0x61),
MKCOLOUR_XYXY(0x61, 0x62),
MKCOLOUR_XXXX(0x62),
MKCOLOUR_XYXY(0x62, 0x63),
MKCOLOUR_XXXX(0x63),
MKCOLOUR_XYXY(0x63, 0x64),
MKCOLOUR_XXXX(0x64),
MKCOLOUR_XYXY(0x64, 0x65),
MKCOLOUR_XXXX(0x65),
MKCOLOUR_XYXY(0x65, 0x66),
MKCOLOUR_XXXX(0x66),
MKCOLOUR_XYXY(0x66, 0x67),
MKCOLOUR_XXXX(0x67),
MKCOLOUR_XXXX(0x67),
};
assert_compile(lengthof(_dark_green_map_heights) == MAX_TILE_HEIGHT + 1);
/** Height map colours for the violet colour scheme, ordered by height. */
static const uint32 _violet_map_heights[] = {
MKCOLOUR_XXXX(0x80),
MKCOLOUR_XYXY(0x80, 0x81),
MKCOLOUR_XXXX(0x81),
MKCOLOUR_XYXY(0x81, 0x82),
MKCOLOUR_XXXX(0x82),
MKCOLOUR_XYXY(0x82, 0x83),
MKCOLOUR_XXXX(0x83),
MKCOLOUR_XYXY(0x83, 0x84),
MKCOLOUR_XXXX(0x84),
MKCOLOUR_XYXY(0x84, 0x85),
MKCOLOUR_XXXX(0x85),
MKCOLOUR_XYXY(0x85, 0x86),
MKCOLOUR_XXXX(0x86),
MKCOLOUR_XYXY(0x86, 0x87),
MKCOLOUR_XXXX(0x87),
MKCOLOUR_XXXX(0x87),
};
assert_compile(lengthof(_violet_map_heights) == MAX_TILE_HEIGHT + 1);
#include "table/heightmap_colours.h"
/** Colour scheme of the smallmap. */
struct SmallMapColourScheme {