0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify previous commit, now never decapitate

Browse source 
but simply draw the mouseover golden hex under fog/shroud as 1.8 does.
A bit less visible under fog, but not important and give a visual cue
for terrain where it's not clear if fogged or not (like water)
This commit is contained in:
Ali El Gariani 2010-08-18 00:58:40 +00:00
parent a5dd484e31
commit d55e309546
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/display.cpp
View file

@ -2087,18 +2087,12 @@ void display::draw_hex(const map_location& loc) {
image::get_image(fog_image, image_type)));
}
bool has_fog_shroud = fogged(loc);
if(!shrouded(loc)) {
const std::vector<surface>& fog_shroud = get_fog_shroud_images(loc, image_type);
has_fog_shroud |= !fog_shroud.empty();
drawing_buffer_add(LAYER_FOG_SHROUD, loc, tblit(xpos, ypos, fog_shroud));
drawing_buffer_add(LAYER_FOG_SHROUD, loc, tblit(xpos, ypos, get_fog_shroud_images(loc, image_type)));
}
if(on_map && loc == mouseoverHex_) {
//when fogged we draw top part above fog (no visible unit to decapitate)
drawing_buffer_add(
has_fog_shroud ? LAYER_MOUSEOVER_BOTTOM : LAYER_MOUSEOVER_TOP,
drawing_buffer_add(LAYER_MOUSEOVER_TOP,
loc, tblit(xpos, ypos, image::get_image("misc/hover-hex-top.png", image::SCALED_TO_HEX)));
drawing_buffer_add(LAYER_MOUSEOVER_BOTTOM,
loc, tblit(xpos, ypos, image::get_image("misc/hover-hex-bottom.png", image::SCALED_TO_HEX)));

2
src/display.hpp
View file

@ -674,11 +674,11 @@ public:
LAYER_UNIT_MISSILE_DEFAULT = LAYER_UNIT_FIRST+90, /**< default layer for missile frames*/
LAYER_UNIT_LAST=LAYER_UNIT_FIRST+100,
LAYER_REACHMAP, /**< "black stripes" on unreachable hexes. */
LAYER_MOUSEOVER_BOTTOM, /**< Bottom half of image following the mouse */
LAYER_FOG_SHROUD, /**< Fog and shroud. */
LAYER_ARROWS, /**< Arrows from the arrows framework. Used for planned moves display. */
LAYER_ACTIONS_NUMBERING, /**< Move numbering for the whiteboard. */
LAYER_SELECTED_HEX, /**< Image on the selected unit */
LAYER_MOUSEOVER_BOTTOM, /**< Bottom half of image following the mouse */
LAYER_ATTACK_INDICATOR, /**< Layer which holds the attack indicator. */
LAYER_UNIT_BAR, /**<
* Unit bars and overlays are drawn on this