[Config] Now storing default username and server address.

config/client.example.lua

@@ -30,3 +30,6 @@ aoStrength = 1
 -- Input
 mouseSensitivity = 8
 
+-- Other
+username = ""
+

source/client/core/Config.cpp

@@ -61,6 +61,10 @@ float Config::aoStrength = 1.0f;
 // Input
 u8 Config::mouseSensitivity = 8;
 
+// Other
+std::string Config::defaultUsername = "";
+std::string Config::defaultServerAddress = "localhost:4242";
+
 void Config::loadConfigFromFile(const char *filename) {
 	if (gk::Filesystem::fileExists(filename)) {
 		sol::state lua;
@@ -92,6 +96,9 @@ void Config::loadConfigFromFile(const char *filename) {
 
 			mouseSensitivity = lua["mouseSensitivity"].get_or(mouseSensitivity);
 
+			defaultUsername = lua["defaultUsername"].get_or(defaultUsername);
+			defaultServerAddress = lua["defaultServerAddress"].get_or(defaultServerAddress);
+
 			gkInfo() << "Config file loaded successfully";
 		}
 		catch (sol::error &e) {
@@ -125,5 +132,8 @@ void Config::saveConfigToFile(const char *filename) {
 	file << "aoStrength = " << aoStrength << std::endl;
 	file << std::endl;
 	file << "mouseSensitivity = " << (u16)mouseSensitivity << std::endl;
+	file << std::endl;
+	file << "defaultUsername = \"" << defaultUsername << "\"" << std::endl;
+	file << "defaultServerAddress = \"" << defaultServerAddress << "\"" << std::endl;
 }
 

source/client/core/Config.hpp

@@ -27,6 +27,8 @@
 #ifndef CONFIG_HPP_
 #define CONFIG_HPP_
 
+#include <string>
+
 #include <gk/core/IntTypes.hpp>
 
 namespace Config {
@@ -58,6 +60,10 @@ namespace Config {
 	// Input
 	extern u8 mouseSensitivity;
 
+	// Other
+	extern std::string defaultUsername;
+	extern std::string defaultServerAddress;
+
 	void loadConfigFromFile(const char *filename);
 	void saveConfigToFile(const char *filename);
 }

source/client/states/ServerConnectState.cpp

@@ -31,7 +31,7 @@
 #include "ServerLoadingState.hpp"
 
 ServerConnectState::ServerConnectState(gk::ApplicationState *parent) : InterfaceState(parent) {
-	m_usernameInput.setString("");
+	m_usernameInput.setString(Config::defaultUsername);
 	m_usernameInput.setCharacterLimit(20);
 	m_usernameInput.setBackgroundSize(150, 20);
 	m_usernameInput.setBackgroundOutline(1, gk::Color::White);
@@ -40,7 +40,7 @@ ServerConnectState::ServerConnectState(gk::ApplicationState *parent) : Interface
 	m_usernameInput.setPlaceholder("Username");
 	m_usernameInput.setFocus(false);
 
-	m_addressInput.setString("localhost:4242");
+	m_addressInput.setString(Config::defaultServerAddress);
 	m_addressInput.setCharacterLimit(15 + 1 + 6);
 	m_addressInput.setBackgroundSize(150, 20);
 	m_addressInput.setBackgroundOutline(1, gk::Color::White);
@@ -83,6 +83,8 @@ ServerConnectState::ServerConnectState(gk::ApplicationState *parent) : Interface
 			auto &serverLoadingState = m_stateStack->push<ServerLoadingState>(game, true, host, port, this);
 			serverLoadingState.setTexturePack(m_texturePack);
 			serverLoadingState.setUsername(username);
+			Config::defaultUsername = username;
+			Config::defaultServerAddress = m_addressInput.string();
 		}
 	});