projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code modernization: src/m* (part 2)
[oweals/minetest.git]
/
src
/
guiMainMenu.h
diff --git
a/src/guiMainMenu.h
b/src/guiMainMenu.h
index 5eaca23fa43cf500622b1072e078b0f75865b3fc..43a3b1a33e851cc20fd63430dddf42340d71ab94 100644
(file)
--- a/
src/guiMainMenu.h
+++ b/
src/guiMainMenu.h
@@
-17,25
+17,23
@@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef GUIMAINMENU_HEADER
-#define GUIMAINMENU_HEADER
+#pragma once
#include "irrlichttypes_extrabloated.h"
#include "modalMenu.h"
#include <string>
#include <list>
#include "irrlichttypes_extrabloated.h"
#include "modalMenu.h"
#include <string>
#include <list>
-enum
-{
- TAB_SINGLEPLAYER=0,
- TAB_MULTIPLAYER,
- TAB_ADVANCED,
- TAB_SETTINGS,
- TAB_CREDITS
+struct MainMenuDataForScript {
+
+ MainMenuDataForScript() = default;
+
+ // Whether the server has requested a reconnect
+ bool reconnect_requested = false;
+ std::string errormessage = "";
};
};
-struct MainMenuData
-{
+struct MainMenuData {
// Client options
std::string servername;
std::string serverdescription;
// Client options
std::string servername;
std::string serverdescription;
@@
-43,24
+41,15
@@
struct MainMenuData
std::string port;
std::string name;
std::string password;
std::string port;
std::string name;
std::string password;
+ // Whether to reconnect
+ bool do_reconnect = false;
// Server options
// Server options
- bool enable_public;
- int selected_world;
- bool simple_singleplayer_mode;
+ int selected_world = 0;
+ bool simple_singleplayer_mode = false;
- //
Actions
-
bool kill
;
+ //
Data to be passed to the script
+
MainMenuDataForScript script_data
;
- //error handling
- std::string errormessage;
- MainMenuData():
- enable_public(false),
- selected_world(0),
- simple_singleplayer_mode(false),
- errormessage("")
- {}
+ MainMenuData() = default;
};
};
-
-#endif
-