made core::Entity and core::Zone child classes from core::Label

1 files changed, 5 insertions, 34 deletions

diff --git a/src/core/entity.cc b/src/core/entity.cc
index d01d825..08fddbf 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -106,8 +106,6 @@ Entity::Entity(const unsigned int flags) :
 	entity_dirty = false;
 
 	entity_model = 0;
-	entity_label.clear();
-	entity_name.clear();
 
 	entity_zone = 0;
 	entity_oldzone = 0;
@@ -209,30 +207,6 @@ void Entity::set_zone(Zone *zone)
 		entity_zone->add(this);
 }
 
-void Entity::set_label(const char *label)
-{
-	entity_label.assign(label);
-	aux::to_label(entity_label);
-}
-
-void Entity::set_label(const std::string &label)
-{
-	entity_label.assign(label);
-	aux::to_label(entity_label);
-}
-
-void Entity::set_name(const char *name)
-{
-	entity_name.assign(name);
-	aux::strip_quotes(entity_name);
-}
-
-void Entity::set_name(const std::string &name)
-{
-	entity_name.assign(name);
-	aux::strip_quotes(entity_name);
-}
-
 void Entity::set_model(model::Model *model)
 {
 	entity_model = model;
@@ -267,8 +241,8 @@ void Entity::serialize_server_create(std::ostream & os) const
 	<< radius() << " "
 	<< std::setprecision(8) << entity_axis.forward() << " "
 	<< std::setprecision(8) << entity_axis.left() << " "
-	<< "\"" << entity_label << "\" "
-	<< "\"" << entity_name << "\" "
+	<< label() << " "
+	<< "\"" << name() << "\" "
 	<< "\"" << (entity_model ? entity_model->name() : "") << "\" ";
 }
 
@@ -311,18 +285,15 @@ void Entity::receive_server_create(std::istream &is)
 	entity_axis[2] = math::crossproduct(entity_axis.forward(), entity_axis.left());
 
 	char c;
-	// read label
-	while ((is.get(c)) && (c != '"'));
-	while ((is.get(c)) && (c != '"'))
-		n += c;
-	entity_label = n;
+	is >> n;
+	set_label(n);
 	n.clear();
 
 	// read name
 	while ((is.get(c)) && (c != '"'));
 	while ((is.get(c)) && (c != '"'))
 		n += c;
-	entity_name = n;
+	set_name(n);
 	n.clear();
 
 	// read model name