Cleanup

engine/console_server.cpp

@@ -41,7 +41,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-void ConsoleServer::init(uint16_t port, bool wait)
+ConsoleServer::ConsoleServer(uint16_t port, bool wait)
 {
 	m_server.bind(port);
 	m_server.listen(5);
@@ -57,7 +57,7 @@ void ConsoleServer::init(uint16_t port, bool wait)
 		while (result.error != AcceptResult::NO_ERROR);
 
 		add_client(client);
-	}
+	}	
 }
 
 void ConsoleServer::shutdown()
@@ -356,9 +356,9 @@ namespace console_server_globals
 	char _buffer[sizeof(ConsoleServer)];
 	ConsoleServer* _console = NULL;
 
-	void init()
+	void init(uint16_t port, bool wait)
 	{
-		_console = new (_buffer) ConsoleServer();
+		_console = new (_buffer) ConsoleServer(port, wait);
 	}
 
 	void shutdown()

engine/console_server.h

@@ -66,7 +66,7 @@ public:
 
 	/// Listens on the given @a port. If @a wait is true, this function
 	/// blocks until a client is connected.
-	void init(uint16_t port, bool wait);
+	ConsoleServer(uint16_t port, bool wait);
 	void shutdown();
 
 	void log_to_all(LogSeverity::Enum severity, const char* message, ...);
@@ -102,7 +102,7 @@ private:
 namespace console_server_globals
 {
 	// Creates the global console server.
-	void init();
+	void init(uint16_t port, bool wait);
 
 	/// Destroys the global console server.
 	void shutdown();

engine/main/main_android.cpp

@@ -255,8 +255,7 @@ void android_main(struct android_app* app)
 	ApkFilesystem src_fs(app->activity->assetManager);
 	ConfigSettings cs = parse_config_file(src_fs);
 
-	console_server_globals::init();
-	console_server_globals::console().init(cs.console_port, false);
+	console_server_globals::init(cs.console_port, false);
 
 	crown::s_advc.run(app, src_fs, cs);
 

engine/main/main_linux.cpp

@@ -437,8 +437,7 @@ int main(int argc, char** argv)
 	DiskFilesystem src_fs(cls.source_dir);
 	ConfigSettings cs = parse_config_file(src_fs);
 
-	console_server_globals::init();
-	console_server_globals::console().init(cs.console_port, cls.wait_console);
+	console_server_globals::init(cs.console_port, cls.wait_console);
 
 	bundle_compiler_globals::init(cls.source_dir, cls.bundle_dir);
 

engine/main/main_windows.cpp

@@ -354,8 +354,7 @@ int main(int argc, char** argv)
 	DiskFilesystem src_fs(cls.source_dir);
 	ConfigSettings cs = parse_config_file(src_fs);
 
-	console_server_globals::init();
-	console_server_globals::console().init(cs.console_port, cls.wait_console);
+	console_server_globals::init(cs.console_port, cls.wait_console);
 
 	bundle_compiler_globals::init(cls.source_dir, cls.bundle_dir);