1 files changed, 11 insertions, 8 deletions

diff --git a/src/core/application.cc b/src/core/application.cc
index f98d44e..837f294 100644
--- a/src/core/application.cc
+++ b/src/core/application.cc
@@ -147,7 +147,7 @@ Application::Application()
 	}
 
 	application_instance = this;
-	application_time = 0;
+	application_timestamp = 0;
 	application_game = 0;
 
 	module_interactive = 0;
@@ -171,9 +171,8 @@ Application::~Application()
 
 void Application::init(int count, char **arguments)
 {
-	con_debug << "Debug messages enabled\n";
 	con_print << "^BInitializing core...\n";
-
+	con_debug << "  debug messages enabled\n";
 	filesystem::init("base", "");
 
 	CommandBuffer::init();
@@ -243,6 +242,7 @@ void Application::init(int count, char **arguments)
 
 	// register our engine functions
 	Func *func = 0;
+
 	func = Func::add("help", func_help);
 	func->set_info("help function");
 
@@ -258,11 +258,13 @@ void Application::init(int count, char **arguments)
 	func = Func::add("disconnect", func_disconnect);
 	func->set_info("leave the current game");
 
-	func = Func::add("say",func_say);
+	func = Func::add("say", func_say);
 	func->set_info("say [text] say something on the public chat");
 
-	func = Func::add("msg",func_msg);
+	func = Func::add("msg", func_msg);
 	func->set_info("msg [player] [text] send a private message to another player");
+
+	func = 0;
 }
 
 void Application::shutdown()
@@ -282,6 +284,7 @@ void Application::shutdown()
 	Module::clear();
 
 	// remove our engine functions
+	Func::remove("msg");
 	Func::remove("say");
 	Func::remove("help");
 	Func::remove("quit");
@@ -373,9 +376,9 @@ void Application::disconnect()
 	}
 }
 
-void Application::frame(float seconds)
+void Application::frame(unsigned long timestamp)
 {
-	application_time += seconds;
+	application_timestamp = timestamp;
 
 	// execute commands in the buffer
 	CommandBuffer::exec();
@@ -384,7 +387,7 @@ void Application::frame(float seconds)
 		return;
 	
 	// run a game interface frame	
-	application_game->frame(seconds);
+	application_game->frame(timestamp);
 	
 	if (!application_game->running()) 
 		disconnect();