From ac8a0111677c27779b2e7effe8ffe42ea013eb57 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Aug 2016 19:16:09 +0300 Subject: Add monster wall collision type. --- src/gui/userpalette.cpp | 7 +++++++ src/gui/widgets/tabs/setup_colors.cpp | 2 ++ 2 files changed, 9 insertions(+) (limited to 'src/gui') diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index ac0049b87..73690c742 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -84,6 +84,7 @@ const std::string ColorTypeNames[CAST_SIZE( "ColorCollisionHighlight", "ColorCollisionAirHighlight", "ColorCollisionWaterHighlight", + "ColorCollisionMonsterHighlight", "ColorCollisionGroundtopHighlight", "ColorWalkableTileHighlight", "ColorNet", @@ -384,6 +385,12 @@ UserPalette::UserPalette() : // TRANSLATORS: palette color _("Water collision highlight"), 64); + addColor(UserColorId::MONSTER_COLLISION_HIGHLIGHT, + 0x2050e0, + GradientType::STATIC, + // TRANSLATORS: palette color + _("Monster collision highlight"), + 64); addColor(UserColorId::GROUNDTOP_COLLISION_HIGHLIGHT, 0xffff00, GradientType::STATIC, diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index d2f38f745..9036356ba 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -294,6 +294,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) { case UserColorId::AIR_COLLISION_HIGHLIGHT: case UserColorId::WATER_COLLISION_HIGHLIGHT: + case UserColorId::MONSTER_COLLISION_HIGHLIGHT: case UserColorId::GROUNDTOP_COLLISION_HIGHLIGHT: case UserColorId::COLLISION_HIGHLIGHT: case UserColorId::PORTAL_HIGHLIGHT: @@ -344,6 +345,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) case UserColorId::HOME_PLACE_BORDER: case UserColorId::AIR_COLLISION_HIGHLIGHT: case UserColorId::WATER_COLLISION_HIGHLIGHT: + case UserColorId::MONSTER_COLLISION_HIGHLIGHT: case UserColorId::GROUNDTOP_COLLISION_HIGHLIGHT: case UserColorId::COLLISION_HIGHLIGHT: case UserColorId::WALKABLE_HIGHLIGHT: -- cgit v1.2.3-70-g09d2