Joachim Breitner has proposed merging lp:~nomeata/widelands/coal-in-editor into lp:widelands.
Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #723112 in widelands: "The name is not shown for resource coal in the resource dialog in the editor" https://bugs.launchpad.net/widelands/+bug/723112 For more details, see: https://code.launchpad.net/~nomeata/widelands/coal-in-editor/+merge/85557 -- https://code.launchpad.net/~nomeata/widelands/coal-in-editor/+merge/85557 Your team Widelands Developers is requested to review the proposed merge of lp:~nomeata/widelands/coal-in-editor into lp:widelands.
=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc' --- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc 2011-11-30 21:38:37 +0000 +++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc 2011-12-13 21:49:27 +0000 @@ -234,11 +234,9 @@ m_set_to_value.set_text(buf); m_cur_selection.set_text - (m_increase_tool.set_tool().get_cur_res() ? - ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase().map() - .world().get_resource(m_increase_tool.set_tool().get_cur_res())->name() - : - ""); + ( ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase().map() + .world().get_resource(m_increase_tool.set_tool().get_cur_res()+1)->name() + ); m_cur_selection.set_pos (Point ((get_inner_w() - m_cur_selection.get_w()) / 2, get_inner_h() - 20));
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
