summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-07 19:16:09 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-07 19:16:09 +0300
commitac8a0111677c27779b2e7effe8ffe42ea013eb57 (patch)
treeade8601cace894f6ce9d6c0833fb6fe6c700b576 /src/gui
parentb1753d59caa299c668b9c269e87f96c46e0ab33a (diff)
downloadmv-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.gz
mv-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.bz2
mv-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.xz
mv-ac8a0111677c27779b2e7effe8ffe42ea013eb57.zip
Add monster wall collision type.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/userpalette.cpp7
-rw-r--r--src/gui/widgets/tabs/setup_colors.cpp2
2 files changed, 9 insertions, 0 deletions
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: