Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / clientlauncher.h

diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h
index 8f8a01e2f554fc7a28557c34829bfcd29bd5ecc1..b280d8e6b2f551e6abed638c3397f79b7f03bf73 100644 (file)
--- 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"
@@ -29,19 +28,19 @@ class RenderingEngine;
 class ClientLauncher
 {
 public:
-       ClientLauncher() {}
+       ClientLauncher() = default;
 
        ~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);
 
@@ -49,25 +48,8 @@ class ClientLauncher
 
        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 = "";
        InputHandler *input = nullptr;
        MyEventReceiver *receiver = nullptr;
        gui::IGUISkin *skin = nullptr;
-       gui::IGUIFont *font = nullptr;
-       SubgameSpec gamespec;
-       WorldSpec worldspec;
-       bool simple_singleplayer_mode;
-
-       // 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