From afec8e7c3aec1a186512b997ed3b717efef8fc43 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Mon, 11 Feb 2008 00:19:11 +0000
Subject: renamed Entity.base_* to Entity.core_* fixed camera::mode::Overview

---
 src/core/entity.cc | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/core/entity.cc')

diff --git a/src/core/entity.cc b/src/core/entity.cc
index 3854fd0..b0808fb 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -13,16 +13,16 @@ namespace core
 
 // --- Entity -----------------------------------------------------
 
-Entity::Entity(unsigned int entity_flags, unsigned int entity_type)
+Entity::Entity(unsigned int entity_flags)
 {
 	flags = entity_flags;
-	type = entity_type;
-
-	base_shape = entity::Diamond;
-	base_color = math::Color(1.0f, 1.0f, 1.0f);
-	base_radius = 1.0f;
+	
+	core_shape = entity::Diamond;
+	core_color = math::Color(1.0f, 1.0f, 1.0f);
+	core_radius = 1.0f;
 
 	core::entity::add(this);
+	type = 0;
 	
 }
 
@@ -31,8 +31,8 @@ Entity::~Entity()
 
 // --- EntityDynamic ------------------------------------------
 
-EntityDynamic::EntityDynamic(unsigned int entity_flags, unsigned int entity_type) : 
-	Entity(entity_type, entity_flags),
+EntityDynamic::EntityDynamic(unsigned int entity_flags) : 
+	Entity(entity_flags),
 	speed(0,0,0)
 {
 
@@ -40,8 +40,8 @@ EntityDynamic::EntityDynamic(unsigned int entity_flags, unsigned int entity_type
 
 // --- EntityControlable ------------------------------------------
 
-EntityControlable::EntityControlable(unsigned int entity_flags, unsigned int entity_type) : 
-	EntityDynamic(entity_type, entity_flags)
+EntityControlable::EntityControlable(unsigned int entity_flags) : 
+	EntityDynamic(entity_flags)
 {
 	owner = 0;
 }
@@ -90,8 +90,9 @@ void list()
 {
 	std::vector<Entity *>::iterator it;
 	for (it=registry.begin(); it != registry.end(); it++) {
-		con_print << "  id " << std::setw(3) << (*it)->id 
-			<< " type " << std::setw(3) << (*it)->type 
+		con_print << "  id " << std::setw(4) << (*it)->id 
+			<< " type " << std::setw(4) << (*it)->core_type()
+			<< ":" << std::setw(4) << (*it)->type
 			<< " " << (*it)->label << std::endl;
 	}
 	con_print << registry.size() << " registered entities" << std::endl;
-- 
cgit v1.2.3