X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient%2Fclientlauncher.h;h=d1fd9a258367b2d3c46c3006dea7fdcc8f601e2f;hb=a049e8267fabd101cb5c6528b3270214cb0647f0;hp=6e3741182da3d6578fd00df5ad7db4b32666ed9f;hpb=9dd0f952e09471f15f59a98c1ae650d99499cd77;p=dragonfireclient.git

diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h
index 6e3741182..d1fd9a258 100644
--- a/src/client/clientlauncher.h
+++ b/src/client/clientlauncher.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __CLIENT_LAUNCHER_H__
-#define __CLIENT_LAUNCHER_H__
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 #include "client/inputhandler.h"
@@ -33,41 +32,24 @@ class ClientLauncher
 
 	~ClientLauncher();
 
-	bool run(GameParams &game_params, const Settings &cmd_args);
+	bool run(GameStartData &start_data, const Settings &cmd_args);
 
-protected:
-	void init_args(GameParams &game_params, const Settings &cmd_args);
+private:
+	void init_args(GameStartData &start_data, const Settings &cmd_args);
 	bool init_engine();
 	void init_input();
 
 	bool launch_game(std::string &error_message, bool reconnect_requested,
-		GameParams &game_params, const Settings &cmd_args);
+		GameStartData &start_data, const Settings &cmd_args);
 
 	void main_menu(MainMenuData *menudata);
 
 	void speed_tests();
 
-	bool list_video_modes = false;
 	bool skip_main_menu = false;
-	bool use_freetype = false;
 	bool random_input = false;
-	std::string address = "";
-	std::string playername = "";
-	std::string password = "";
+	RenderingEngine *m_rendering_engine = nullptr;
 	InputHandler *input = nullptr;
 	MyEventReceiver *receiver = nullptr;
 	gui::IGUISkin *skin = nullptr;
-	gui::IGUIFont *font = nullptr;
-	SubgameSpec gamespec;
-	WorldSpec worldspec;
-	bool simple_singleplayer_mode = false;
-
-	// These are set up based on the menu and other things
-	// TODO: Are these required since there's already playername, password, etc
-	std::string current_playername = "inv£lid";
-	std::string current_password = "";
-	std::string current_address = "does-not-exist";
-	int current_port = 0;
 };
-
-#endif