diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-05-31 22:23:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-05-31 22:23:23 +0300 |
| commit | fc5ba333f8832f3d8e054e7c74df1e3cd353645f (patch) | |
| tree | 16aabceaaa2b197d006bd357d3176acac292cde7 /src/gui | |
| parent | 9875c00dc37b1d7b55e1154075a0cd2d997a490d (diff) | |
| download | manaplus-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.tar.gz manaplus-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.tar.bz2 manaplus-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.tar.xz manaplus-fc5ba333f8832f3d8e054e7c74df1e3cd353645f.zip | |
Add sittop sprites support.
Add groundtop collision support (not collision but special selected tiles).
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/setup_colors.cpp | 2 | ||||
| -rw-r--r-- | src/gui/userpalette.cpp | 3 | ||||
| -rw-r--r-- | src/gui/userpalette.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 800b38337..cbad6f4d9 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -262,6 +262,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED) { case UserPalette::AIR_COLLISION_HIGHLIGHT: case UserPalette::WATER_COLLISION_HIGHLIGHT: + case UserPalette::GROUNDTOP_COLLISION_HIGHLIGHT: case UserPalette::COLLISION_HIGHLIGHT: case UserPalette::PORTAL_HIGHLIGHT: case UserPalette::HOME_PLACE: @@ -305,6 +306,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED) case UserPalette::HOME_PLACE_BORDER: case UserPalette::AIR_COLLISION_HIGHLIGHT: case UserPalette::WATER_COLLISION_HIGHLIGHT: + case UserPalette::GROUNDTOP_COLLISION_HIGHLIGHT: case UserPalette::COLLISION_HIGHLIGHT: case UserPalette::WALKABLE_HIGHLIGHT: case UserPalette::ROAD_POINT: diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 49a81c4dc..60f99b66c 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -69,6 +69,7 @@ const std::string ColorTypeNames[] = "ColorCollisionHighlight", "ColorCollisionAirHighlight", "ColorCollisionWaterHighlight", + "ColorCollisionGroundtopHighlight", "ColorWalkableTileHighlight", "ColorAttackRange", "ColorAttackRangeBorder", @@ -153,6 +154,8 @@ UserPalette::UserPalette(): _("Air collision Highlight"), 64); addColor(WATER_COLLISION_HIGHLIGHT, 0x2050e0, STATIC, _("Water collision Highlight"), 64); + addColor(GROUNDTOP_COLLISION_HIGHLIGHT, 0xffff00, STATIC, + _("Special ground collision Highlight"), 20); addColor(WALKABLE_HIGHLIGHT, 0x00D000, STATIC, _("Walkable Highlight"), 255); addColor(ATTACK_RANGE, 0xffffff, STATIC, diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 6fba30abc..3d53cc26c 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -68,6 +68,7 @@ class UserPalette : public Palette, public gcn::ListModel COLLISION_HIGHLIGHT, AIR_COLLISION_HIGHLIGHT, WATER_COLLISION_HIGHLIGHT, + GROUNDTOP_COLLISION_HIGHLIGHT, WALKABLE_HIGHLIGHT, ATTACK_RANGE, ATTACK_RANGE_BORDER, |