From 583ec3285c41e9d253c4aaabd2af4dadac75f3a7 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 23 Nov 2008 12:34:07 +0000 Subject: clean module consturction/destruction --- src/client/client.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/client/client.cc') 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; } -- cgit v1.2.3