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

Fix the menu entry "End Turn" not switching to "End Scenario".

Browse source
This commit is contained in:
fendrin 2013-05-12 19:06:02 +02:00
parent 9c4e4b1272
commit 6689c4281b
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hotkeys.cpp
View file

@ -1393,7 +1393,7 @@ std::vector<std::string> command_executor::get_menu_images(display& disp, const
} else {
std::string desc = hotkey::get_description(item);
if (hk == HOTKEY_ENDTURN) {
const theme::menu *b = disp.get_theme().get_menu_item("button-endturn");
const theme::action *b = disp.get_theme().get_action_item("button-endturn");
if (b) {
desc = b->title();
}

7
src/theme.cpp
View file

@ -891,6 +891,13 @@ const theme::menu *theme::get_menu_item(const std::string &key) const
return NULL;
}
const theme::action *theme::get_action_item(const std::string &key) const
{
BOOST_FOREACH(const theme::action &a, actions_) {
if (a.get_id() == key) return &a;
}
return NULL;
}
theme::object* theme::refresh_title(const std::string& id, const std::string& new_title){

1
src/theme.hpp
View file

@ -261,6 +261,7 @@ public:
const status_item* get_status_item(const std::string& item) const;
const menu *get_menu_item(const std::string &key) const;
const action* get_action_item(const std::string &key) const;
const SDL_Rect& main_map_location(const SDL_Rect& screen) const
{ return main_map_.location(screen); }