docking, bumps network protocol version

1 files changed, 18 insertions, 12 deletions

diff --git a/src/core/application.h b/src/core/application.h
index f241aa3..bb76cfe 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -39,7 +39,7 @@ public:
 	/// true if the core is connected to a running game interface
 	inline bool connected() const { return (application_game && application_game->running()); }
 
-	/// return the game interface, returns 0 if the pplication is not connected to a game
+	/// return the game interface, returns 0 if the application is not connected to a game
 	inline GameInterface *game() { return application_game; }
 
 /*-----  mutators ------------------------------------------------- */	
@@ -84,8 +84,6 @@ public:
 	/// remove sound source notification
 	virtual void notify_remove_sound(size_t source);
 
-/*-----  static --------------------------------------------------- */
-
 	/// a pointer to the current application instance
 	static inline Application *instance() { return application_instance; }
 
@@ -108,23 +106,31 @@ protected:
 private:
 	/// time the core has been running
 	unsigned long		application_timestamp;
+
 	GameInterface		*application_game;
+	Module			*module_interactive;
+
 	static Application	*application_instance;
 
-	/// last loaded interactive module
-	Module			*module_interactive;
+	/*-- engine functions --*/
+
+	static void func_help(std::string const &args);
+	static void func_quit(std::string const  &args);
+	static void func_connect(std::string const &args);
+	static void func_disconnect(std::string const  &args);
+	static void func_say(std::string const &args);
+	static void func_msg(std::string const &args);
+	static void func_load(std::string const &args);
 };
 
-/// pointer to the current Application
+/// pointer to the application
 inline Application *application() { return Application::instance(); }
 
-/// pointer to the current GameInterface
-inline GameInterface *game() { return Application::instance()->game(); }
-
 /// pointer to the console
-inline sys::ConsoleInterface *console() { return sys::ConsoleInterface::instance(); };
+inline sys::ConsoleInterface *console() { return sys::ConsoleInterface::instance(); }
 
-} // namespace core
+/// pointer to the game interface
+inline GameInterface *game() { return Application::instance()->game(); }
+}
 
 #endif // __INCLUDED_CORE_APPLICATION_H__
-