added new cursors submitted by woodwizzle
added icons to campaigns
|
@ -61,6 +61,7 @@
|
|||
|
||||
[campaign]
|
||||
id=heir_throne
|
||||
icon=konrad-commander.png
|
||||
name=Heir to the Throne
|
||||
first_scenario=The_Elves_Besieged
|
||||
difficulties=EASY,NORMAL,HARD
|
||||
|
@ -69,6 +70,7 @@
|
|||
|
||||
[campaign]
|
||||
id=dark_hordes
|
||||
icon=undead-adept.png
|
||||
name=The Dark Hordes
|
||||
first_scenario=Brother_Against_Brother
|
||||
difficulties=EASY,NORMAL,HARD
|
||||
|
|
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 583 B After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 549 B After Width: | Height: | Size: 883 B |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.4 KiB |
12
src/game.cpp
|
@ -665,7 +665,17 @@ int play_game(int argc, char** argv)
|
|||
std::vector<std::string> campaign_names;
|
||||
|
||||
for(config::const_child_iterator i = campaigns.first; i != campaigns.second; ++i) {
|
||||
campaign_names.push_back(translate_string_default((**i)["id"],(**i)["name"]));
|
||||
std::stringstream str;
|
||||
const std::string& icon = (**i)["icon"];
|
||||
if(icon == "") {
|
||||
str << " ,";
|
||||
} else {
|
||||
str << "&" << icon << ",";
|
||||
}
|
||||
|
||||
str << translate_string_default((**i)["id"],(**i)["name"]);
|
||||
|
||||
campaign_names.push_back(str.str());
|
||||
}
|
||||
|
||||
if(campaign_names.empty()) {
|
||||
|
|
|
@ -394,6 +394,8 @@ void turn_info::mouse_press(const SDL_MouseButtonEvent& event)
|
|||
current_paths_ = paths();
|
||||
current_route_.steps.clear();
|
||||
gui_.set_route(NULL);
|
||||
|
||||
cursor::set(cursor::NORMAL);
|
||||
} else {
|
||||
const theme::menu* const m = gui_.get_theme().context_menu();
|
||||
if(m != NULL) {
|
||||
|
|