clean module consturction/destruction

1 files changed, 12 insertions, 5 deletions

diff --git a/src/client/client.cc b/src/client/client.cc
index 061f29b..650813c 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -17,6 +17,7 @@
 #include "client/input.h"
 #include "client/view.h"
 #include "core/core.h"
+#include "core/loader.h"
 #include "core/zone.h"
 #include "render/render.h"
 #include "ui/ui.h"
@@ -167,15 +168,21 @@ void Client::run()
 
 void Client::frame(unsigned long timestamp)
 {
+	input::frame();
+
 	core::Application::frame(timestamp);
 
-	if (!core::application()->connected()) {
+	if (!connected()) {
+		std::string module_label(core::Loader::label());
+
 		// load the intro if nothing is running
-		if (core::application()->load("intro")) {
-			core::application()->connect("");
+		if (load("intro")) {
+			connect("");
+			if (module_label.size())
+				load(module_label);
 		}
 		// show the console if everything fails
-		if (!core::application()->connected() && !ui::console()->visible()) {
+		if (!connected() && !ui::console()->visible()) {
 			ui::console()->toggle();
 		}
 	} else if (!ui::root()->active()) {
@@ -207,7 +214,7 @@ void Client::frame(unsigned long timestamp)
 	}
 
 	video::frame((float)(timestamp - previous_timestamp) / 1000.0f);
-	input::frame();
+	
 	previous_timestamp = timestamp;
 }