Author: ilor
Date: Thu Jul 31 14:47:47 2008
New Revision: 28287
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28287&view=rev
Log:
less debug, tweak highlighting
Modified:
trunk/src/editor2/editor_controller.cpp
trunk/src/editor2/editor_display.cpp
Modified: trunk/src/editor2/editor_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_controller.cpp?rev=28287&r1=28286&r2=28287&view=diff
==============================================================================
--- trunk/src/editor2/editor_controller.cpp (original)
+++ trunk/src/editor2/editor_controller.cpp Thu Jul 31 14:47:47 2008
@@ -585,16 +585,13 @@
void editor_controller::refresh_after_action(bool drag_part)
{
-
std::cerr<<__FUNCTION__<<get_map_context().changed_locations().size()<<"\n";
if (get_map_context().needs_reload()) {
- std::cerr<<"reload\n";
reload_map();
get_map_context().set_needs_reload(false);
get_map_context().set_needs_terrain_rebuild(false);
get_map_context().clear_changed_locations();
} else if (get_map_context().needs_terrain_rebuild()) {
if (!drag_part || auto_update_transitions_ ||
get_map_context().everything_changed()) {
- std::cerr<<"rebuild all\n";
gui().rebuild_all();
gui().invalidate_all();
get_map_context().set_needs_terrain_rebuild(false);
@@ -605,7 +602,6 @@
gui().invalidate(get_map_context().changed_locations());
}
} else {
- std::cerr<<"invalidate\n";
if (get_map_context().everything_changed()) {
gui().invalidate_all();
} else {
@@ -672,6 +668,7 @@
get_mouse_action()->move(*gui_, x, y);
}
}
+ gui().highlight_hex(hex_clicked);
}
bool editor_controller::left_click(int x, int y, const bool browse)
Modified: trunk/src/editor2/editor_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_display.cpp?rev=28287&r1=28286&r2=28287&view=diff
==============================================================================
--- trunk/src/editor2/editor_display.cpp (original)
+++ trunk/src/editor2/editor_display.cpp Thu Jul 31 14:47:47 2008
@@ -64,7 +64,7 @@
image::TYPE editor_display::get_image_type(const gamemap::location& loc)
{
- if(loc == mouseoverHex_ && map_.on_board_with_border(mouseoverHex_)) {
+ if(brush_locations_.empty() && loc == mouseoverHex_ &&
map_.on_board_with_border(mouseoverHex_)) {
return image::BRIGHTENED;
} else if (brush_locations_.find(loc) != brush_locations_.end()) {
return image::BRIGHTENED;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
