diff --git a/data/game.cfg b/data/game.cfg index f37642600f8..63c998c8c4e 100644 --- a/data/game.cfg +++ b/data/game.cfg @@ -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 diff --git a/images/cursors/attack.png b/images/cursors/attack.png index 2406ec9e585..bb8f0035288 100644 Binary files a/images/cursors/attack.png and b/images/cursors/attack.png differ diff --git a/images/cursors/move.png b/images/cursors/move.png index 4e7c08971df..a535f66f674 100644 Binary files a/images/cursors/move.png and b/images/cursors/move.png differ diff --git a/images/cursors/normal.png b/images/cursors/normal.png index 184e08c4062..4dfd6c8560f 100644 Binary files a/images/cursors/normal.png and b/images/cursors/normal.png differ diff --git a/images/cursors/wait.png b/images/cursors/wait.png index 104fddfc2c7..b2ec4c7f886 100644 Binary files a/images/cursors/wait.png and b/images/cursors/wait.png differ diff --git a/src/game.cpp b/src/game.cpp index 4648e0a436c..d3e1e8beba4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -665,7 +665,17 @@ int play_game(int argc, char** argv) std::vector 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()) { diff --git a/src/playturn.cpp b/src/playturn.cpp index db096fab226..d2a10ac621f 100644 --- a/src/playturn.cpp +++ b/src/playturn.cpp @@ -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) {