Permalink
Browse files

Merge branch 'hover-hex'. Part of feature #16350.

  • Loading branch information...
2 parents 6b02a92 + 3840321 commit 00165dd5c0e54d3fae1b919e742f6ba06ccccbd1 @AI0867 AI0867 committed Jun 11, 2013
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -274,13 +274,26 @@ void game_display::draw_hex(const map_location& loc)
if(on_map && loc == mouseoverHex_) {
tdrawing_layer hex_top_layer = LAYER_MOUSEOVER_BOTTOM;
- if( get_visible_unit(loc, (*teams_)[viewing_team()] ) != NULL ) {
+ const unit *u = get_visible_unit(loc, (*teams_)[viewing_team()] );
+ if( u != NULL ) {
hex_top_layer = LAYER_MOUSEOVER_TOP;
}
- drawing_buffer_add( hex_top_layer,
- loc, xpos, ypos, image::get_image("misc/hover-hex-top.png", image::SCALED_TO_HEX));
- drawing_buffer_add(LAYER_MOUSEOVER_BOTTOM,
- loc, xpos, ypos, image::get_image("misc/hover-hex-bottom.png", image::SCALED_TO_HEX));
+ if(u != NULL && (*teams_)[currentTeam_].is_enemy(u->side())) {
+ drawing_buffer_add( hex_top_layer,
+ loc, xpos, ypos, image::get_image("misc/hover-hex-enemy-top.png", image::SCALED_TO_HEX));
+ drawing_buffer_add(LAYER_MOUSEOVER_BOTTOM,
+ loc, xpos, ypos, image::get_image("misc/hover-hex-enemy-bottom.png", image::SCALED_TO_HEX));
+ } else if(u != NULL && (*teams_)[currentTeam_].side() == u->side()) {
+ drawing_buffer_add( hex_top_layer,
+ loc, xpos, ypos, image::get_image("misc/hover-hex-yours-top.png", image::SCALED_TO_HEX));
+ drawing_buffer_add(LAYER_MOUSEOVER_BOTTOM,
+ loc, xpos, ypos, image::get_image("misc/hover-hex-yours-bottom.png", image::SCALED_TO_HEX));
+ } else {
+ drawing_buffer_add( hex_top_layer,
+ loc, xpos, ypos, image::get_image("misc/hover-hex-top.png", image::SCALED_TO_HEX));
+ drawing_buffer_add(LAYER_MOUSEOVER_BOTTOM,
+ loc, xpos, ypos, image::get_image("misc/hover-hex-bottom.png", image::SCALED_TO_HEX));
+ }
}

0 comments on commit 00165dd

Please sign in to comment.