From dba77791cc33eb8f319c72d6b960965fc6f8b206 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Wed, 7 Oct 2020 17:53:35 +1100
Subject: [PATCH] Removed loading screen animation preference

This was added several years ago as a workaround to crashes when the loading screen implementation was less stable.
---
 src/gui/dialogs/loading_screen.cpp |  7 +------
 src/preferences/general.cpp        | 10 ----------
 src/preferences/general.hpp        |  3 ---
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/gui/dialogs/loading_screen.cpp b/src/gui/dialogs/loading_screen.cpp
index b4fefe632b0..d03c5a7c922 100644
--- a/src/gui/dialogs/loading_screen.cpp
+++ b/src/gui/dialogs/loading_screen.cpp
@@ -202,15 +202,10 @@ loading_screen::~loading_screen()
 
 void loading_screen::display(std::function<void()> f)
 {
-	const bool use_loadingscreen_animation = !preferences::disable_loadingscreen_animation();
-
 	if(singleton_ || CVideo::get_singleton().faked()) {
 		f();
-	} else if(use_loadingscreen_animation) {
-		loading_screen(f).show();
 	} else {
-		loading_screen(std::function<void()>()).show();
-		f();
+		loading_screen(f).show();
 	}
 }
 
diff --git a/src/preferences/general.cpp b/src/preferences/general.cpp
index 3ef915bca38..49e93d3fabe 100644
--- a/src/preferences/general.cpp
+++ b/src/preferences/general.cpp
@@ -925,16 +925,6 @@ void set_disable_auto_moves(bool value)
 	preferences::set("disable_auto_moves", value);
 }
 
-bool disable_loadingscreen_animation()
-{
-	return get("disable_loadingscreen_animation", false);
-}
-
-void set_disable_loadingscreen_animation(bool value)
-{
-	set("disable_loadingscreen_animation", value);
-}
-
 bool damage_prediction_allow_monte_carlo_simulation()
 {
 	return get("damage_prediction_allow_monte_carlo_simulation", true);
diff --git a/src/preferences/general.hpp b/src/preferences/general.hpp
index 02d51ce9d50..da4e67d0d0d 100644
--- a/src/preferences/general.hpp
+++ b/src/preferences/general.hpp
@@ -242,9 +242,6 @@ namespace preferences {
 	bool disable_auto_moves();
 	void set_disable_auto_moves(bool value);
 
-	bool disable_loadingscreen_animation();
-	void set_disable_loadingscreen_animation(bool value);
-
 	bool damage_prediction_allow_monte_carlo_simulation();
 	void set_damage_prediction_allow_monte_carlo_simulation(bool value);