Reduce needlessly large closures

wesnoth · Apr 1, 2016 · 1c5f602 · 1c5f602
1 parent 5195758
commit 1c5f602
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/game_config_manager.cpp b/src/game_config_manager.cpp
@@ -135,10 +135,11 @@ void game_config_manager::load_game_config_with_loadscreen(FORCE_RELOAD_CONFIG f
 		}
 	}
 
-	gui2::tloadscreen::display(video_, [=]() {
+	gui2::tloadscreen::display(video_, [this, force_reload, classification]() {
 		load_game_config(force_reload, classification);
 	});
 }
+
 void game_config_manager::load_game_config(FORCE_RELOAD_CONFIG force_reload,
 	game_classification const* classification)
 {

diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
@@ -1011,7 +1011,7 @@ void game_launcher::launch_game(RELOAD_GAME_DATA reload)
 		return;
 	}
 
-	gui2::tloadscreen::display(video(), [=]() {
+	gui2::tloadscreen::display(video(), [this, reload]() {
 
 	gui2::tloadscreen::progress("load data");
 	if(reload == RELOAD_DATA) {

diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp
@@ -644,7 +644,7 @@ static int do_gameloop(const std::vector<std::string>& args)
 	game_config_manager config_manager(cmdline_opts, game->video(),
 	    game->jump_to_editor());
 
-	gui2::tloadscreen::display(game->video(), [&]() {
+	gui2::tloadscreen::display(game->video(), [&res, &config_manager]() {
 		gui2::tloadscreen::progress("load config");
 		res = config_manager.init_game_config(game_config_manager::NO_FORCE_RELOAD);
 	});
@@ -851,7 +851,7 @@ static int do_gameloop(const std::vector<std::string>& args)
 			}
 			continue;
 		} else if(res == gui2::ttitle_screen::RELOAD_GAME_DATA) {
-			gui2::tloadscreen::display(game->video(), [&]() {
+			gui2::tloadscreen::display(game->video(), [&config_manager]() {
 				config_manager.reload_changed_game_config();
 				image::flush_cache();
 			});