Major cleanup

Much better now!

1 files changed, 1 insertions, 29 deletions

diff --git a/src/Data/Room.cpp b/src/Data/Room.cpp
index b1d7473..d7355fc 100644
--- a/src/Data/Room.cpp
+++ b/src/Data/Room.cpp
@@ -41,18 +41,7 @@ void Room::populateTriangle(xmlpp::Element *tNode) {
 }
 
 Room::Room(xmlpp::Element *node) : roomNode(node) {
-  floorNode = dynamic_cast<xmlpp::Element*>(node->get_children("floor").front());
-  
-  xmlpp::Node::NodeList triangleList = floorNode->get_children("triangle");
-  
-  for(xmlpp::Node::NodeList::iterator t = triangleList.begin(); t != triangleList.end(); ++t) {
-    xmlpp::Element *tNode = dynamic_cast<xmlpp::Element*>(*t);
-    
-    if(tNode)
-      floor.push_back(new Triangle(tNode));
-  }
-  
-  triangleList = node->get_children("triangle");
+  xmlpp::Node::NodeList triangleList = node->get_children("triangle");
   
   for(xmlpp::Node::NodeList::iterator t = triangleList.begin(); t != triangleList.end(); ++t) {
     xmlpp::Element *tNode = dynamic_cast<xmlpp::Element*>(*t);
@@ -86,22 +75,5 @@ void Room::removeTriangle(Triangle *t) {
   delete t;
 }
 
-Triangle* Room::addFloorTriangle() {
-  xmlpp::Element *tNode = floorNode->add_child("triangle");
-  
-  populateTriangle(tNode);
-  
-  Triangle *t = new Triangle(tNode);
-  floor.push_back(t);
-  
-  return t;
-}
-
-void Room::removeFloorTriangle(Triangle *t) {
-  floorNode->remove_child(t->getNode());
-  floor.remove(t);
-  delete t;
-}
-
 }
 }