Attempt to fix build on XCode

This commit is contained in:
Charles Dang 2017-04-21 05:33:16 +11:00
parent 30340aaedb
commit 3252348dd6

View file

@ -941,7 +941,7 @@ gui::button::TYPE display::string_to_button_type(std::string type)
static const std::string& get_direction(size_t n)
{
static const std::array<std::string, 6> dirs { "-n", "-ne", "-se", "-s", "-sw", "-nw" };
static const std::array<std::string, 6> dirs {{ "-n", "-ne", "-se", "-s", "-sw", "-nw" }};
return dirs[n >= dirs.size() ? 0 : n];
}
@ -1203,13 +1203,13 @@ void display::drawing_buffer_add(const drawing_layer layer,
// public into the definition of drawing_layer
//
// The drawing is done per layer_group, the range per group is [low, high).
const std::array<display::drawing_layer, 4> display::drawing_buffer_key::layer_groups {
const std::array<display::drawing_layer, 4> display::drawing_buffer_key::layer_groups {{
LAYER_TERRAIN_BG,
LAYER_UNIT_FIRST,
LAYER_UNIT_MOVE_DEFAULT,
// Make sure the movement doesn't show above fog and reachmap.
LAYER_REACHMAP
};
}};
enum {
// you may adjust the following when needed: