Author: esr
Date: Mon Jul 2 00:14:01 2007
New Revision: 18605
URL: http://svn.gna.org/viewcvs/wesnoth?rev=18605&view=rev
Log:
Fix the broken editor build.
Modified:
trunk/src/Makefile.am
trunk/src/editor/editor.cpp
trunk/src/editor/editor_palettes.cpp
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=18605&r1=18604&r2=18605&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Mon Jul 2 00:14:01 2007
@@ -188,6 +188,7 @@
game_display.cpp \
game_events.cpp \
gamestatus.cpp \
+ generate_report.cpp \
generic_event.cpp \
halo.cpp \
help.cpp \
@@ -221,6 +222,7 @@
statistics.cpp \
team.cpp \
theme.cpp \
+ terrain_filter.cpp \
tooltips.cpp \
unit.cpp \
unit_abilities.cpp \
Modified: trunk/src/editor/editor.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor.cpp?rev=18605&r1=18604&r2=18605&view=diff
==============================================================================
--- trunk/src/editor/editor.cpp (original)
+++ trunk/src/editor/editor.cpp Mon Jul 2 00:14:01 2007
@@ -1424,7 +1424,7 @@
if (func != l_button_func_) {
reset_mouseover_overlay();
l_button_func_ = func;
- reports::set_report_content(reports::EDIT_LEFT_BUTTON_FUNCTION,
+ gui_.set_report_content(reports::EDIT_LEFT_BUTTON_FUNCTION,
hotkey::get_hotkey(get_action_name(func)).get_description());
gui_.invalidate_game_status();
l_button_palette_dirty_ = true;
Modified: trunk/src/editor/editor_palettes.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor_palettes.cpp?rev=18605&r1=18604&r2=18605&view=diff
==============================================================================
--- trunk/src/editor/editor_palettes.cpp (original)
+++ trunk/src/editor/editor_palettes.cpp Mon Jul 2 00:14:01 2007
@@ -424,7 +424,7 @@
+ get_terrain_string(selected_fg_terrain()) + "\n"
+ std::string(_("BG")) +
": " + get_terrain_string(selected_bg_terrain());
- reports::set_report_content(reports::SELECTED_TERRAIN, msg);
+ gui_.set_report_content(reports::SELECTED_TERRAIN, msg);
}
void terrain_palette::load_tooltips()
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits