entities, step 1

1 files changed, 21 insertions, 10 deletions

diff --git a/src/core/application.cc b/src/core/application.cc
index e444b14..5979fc7 100644
--- a/src/core/application.cc
+++ b/src/core/application.cc
@@ -4,9 +4,11 @@
    the terms of the GNU General Public License version 2
 */
 
-#include "core/core.h"
-#include "filesystem/filesystem.h"
 #include "sys/sys.h"
+#include "filesystem/filesystem.h"
+#include "core/entity.h"
+#include "core/application.h"
+#include "core/core.h"
 
 #include <iostream>
 #include <errno.h>
@@ -16,7 +18,7 @@ namespace core
 {
 
 // --------------- engine functions  ------------------------------
-extern "C" void func_print(std::stringstream &args)
+void func_print(std::stringstream &args)
 {
 	char text[MAXCMDSIZE];
 	if (args.getline(text, MAXCMDSIZE)) {
@@ -27,12 +29,12 @@ extern "C" void func_print(std::stringstream &args)
 	}
 }
 
-extern "C" void func_help(std::stringstream &args)
+void func_help(std::stringstream &args)
 {
 	con_print << "This is the help function" << std::endl;
 }
 
-extern "C" void func_quit(std::stringstream &args)
+void func_quit(std::stringstream &args)
 {
 	if (Application::instance()) {
 		Application::instance()->shutdown();
@@ -40,28 +42,32 @@ extern "C" void func_quit(std::stringstream &args)
 	}
 }
 
-extern "C" void func_connect(std::stringstream &args)
+void func_connect(std::stringstream &args)
 {
 	if (Application::instance())
 		Application::instance()->connect();
 }
 
-extern "C" void func_disconnect(std::stringstream &args)
+void func_disconnect(std::stringstream &args)
 {
 	if (Application::instance())
 		Application::instance()->disconnect();
 }
 
-extern "C" void func_list_func(std::stringstream &args)
+void func_list_func(std::stringstream &args)
 {
 	func::list();
 }
 
-extern "C" void func_list_var(std::stringstream &args)
+void func_list_var(std::stringstream &args)
 {
 	cvar::list();
 }
 
+void func_list_ent(std::stringstream &args)
+{
+	entity::list();
+}
 // --------------- signal_handler -----------------------------------
 
 extern "C" void signal_handler(int signum)
@@ -133,6 +139,7 @@ void Application::init()
 
 	func::add("list_var", func_list_var);
 	func::add("list_func", func_list_func);
+	func::add("list_ent", func_list_ent);
 
 	if (game())
 		game()->connected = false;
@@ -166,8 +173,10 @@ void Application::connect()
 	if (game()->connected) {
 		con_warn << "Connected. Disconnect first." << std::endl;
 	}
-
+	
+	entity::clear();
 	game()->current_time = 0;
+
 	if (game()->connected = game()->init()) {
 		con_print << "Connected." << std::endl;
 	} else {
@@ -192,6 +201,8 @@ void Application::disconnect()
 	game()->connected = false;
 	game()->current_time = 0;
 
+	entity::clear();
+
 	con_print << "Disconnected." << std::endl;
 }