zone support

1 files changed, 12 insertions, 11 deletions

diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index afdc269..db8852a 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -188,10 +188,10 @@ GameServer::~GameServer()
 		server_network = 0;
 	}
 
-	if (!Cvar::sv_dedicated->value())
-		player_disconnect(localplayer());
-
 	if (server_module) {
+		if (server_module->running() && !Cvar::sv_dedicated->value())
+			player_disconnect(localplayer());
+
 		server_module->shutdown();
 
 		if (server_module != Module::preload())
@@ -480,6 +480,9 @@ void GameServer::player_disconnect(Player *player)
 	message.append("^B disconnects.");
 	broadcast(message, player);
 
+	// clear all player assets
+	player->clear_assets();
+
 	// notify the game module
 	server_module->player_disconnect(player);
 
@@ -533,8 +536,7 @@ void GameServer::frame(float seconds)
 	}
 
 	// run a time frame on each entity
-	std::map<unsigned int, Entity *>::iterator it;
-	for (it=Entity::registry.begin(); it != Entity::registry.end(); it++) {
+	for (Entity::Registry::iterator it=Entity::registry().begin(); it != Entity::registry().end(); it++) {
 		Entity *entity = (*it).second;
 
 		if ((entity->type() == Entity::Controlable) || (entity->type() == Entity::Dynamic)) {
@@ -562,8 +564,7 @@ void GameServer::frame(float seconds)
 		server_network->broadcast_frame(server_time, server_previoustime);
 
 		// send changes in the world
-		std::map<unsigned int, Entity *>::iterator it;
-		for (it=Entity::registry.begin(); it != Entity::registry.end(); it++) {
+		for (Entity::Registry::iterator it=Entity::registry().begin(); it != Entity::registry().end(); it++) {
 
 			Entity *entity = (*it).second;
 
@@ -573,7 +574,7 @@ void GameServer::frame(float seconds)
 					server_network->broadcast_entity_delete(entity);
 				}
 
-				core::Entity::remove(entity->id());
+				core::Entity::erase(entity->id());
 
 			} else if (entity->entity_created) {
 
@@ -597,12 +598,12 @@ void GameServer::frame(float seconds)
 	} else {
 
 		// local update stub
-		std::map<unsigned int, Entity *>::iterator it;
-		for (it=Entity::registry.begin(); it != Entity::registry.end(); it++) {
+		for (Entity::Registry::iterator it=Entity::registry().begin(); it != Entity::registry().end(); it++) {
 
 			Entity *entity = (*it).second;
 			if (entity->entity_destroyed) {
-				core::Entity::remove(entity->id());
+				Entity::erase(entity->id());
+
 			} else if (entity->entity_created) {
 				entity->entity_created = false;