Index: code/branches/FICN/src/loader/LevelLoader.cc
===================================================================
--- code/branches/FICN/src/loader/LevelLoader.cc	(revision 496)
+++ code/branches/FICN/src/loader/LevelLoader.cc	(revision 507)
@@ -1,4 +1,7 @@
-#include <string.h>
+#include <string>
+#include <vector>
 #include <iostream>
+#include <algorithm>
+#include <iterator>
 
 #include "LevelLoader.h"
@@ -127,134 +130,26 @@
 	}
 	
-	
-	//orxonox::BaseObject* bla = orxonox::ID("classname")->fabricate();
-	//bla->loadParams();
+	LevelLoader::~LevelLoader()
+	{
+
+	}
 	
 	
-	/*
-  	rootNode = XMLNode::openFileHelper(dir.c_str(),"orxonoxworld");
-  	// TODO: Error handling
-
-	// Assing general level infos to class variables
+	string LevelLoader::name()
+	{
+		return this->name_;
+	}
 	
-  	this->name_ = rootNode.getAttribute("name");
-  	this->image_ = rootNode.getAttribute("image");
-  	this->description_ = rootNode.getChildNode("description").getText();
-  
-  	loadingScreenNode = rootNode.getChildNode("loading");
-  	if (!loadingScreenNode.isEmpty())
-  	{
-  		this->showLoadingScreen();
-  	}
-
-  	worldNode = rootNode.getChildNode("world");
-  	if (!worldNode.isEmpty())
-  	{
-  		
-  	}
-  	*/
-
-  
-  /*
-  // Assign sub-nodes
-  if (rootNode.nChildNode("LightManager")==1)
-  {
-  	// Init Luightmanager...
-  }*/
-  
-  /*
-  
-	worldNode = rootNode.getChildNode("WorldEntities");
-	scriptNode = rootNode.getChildNode("ScriptManager");
-	cameraNode = rootNode.getChildNode("CameraMan");
-	lightNode = rootNode.getChildNode("LightManager");
-*/
-
-
-
-LevelLoader::~LevelLoader()
-{
+	string LevelLoader::description()
+	{
+		return this->description_;
+	}
+	
+	string LevelLoader::image()
+	{
+		return this->image_;
+	}
 
 
 }
 
-
-string LevelLoader::name()
-{
-	return this->name_;
-}
-
-string LevelLoader::description()
-{
-	return this->description_;
-}
-
-string LevelLoader::image()
-{
-	return this->image_;
-}
-
-
-/*
-
-
-void LevelLoader::loadWorld(WorldManager* wm)
-{
-	if (!worldNode.getChildNode("lights").isEmpty())
-	{
-		
-		
-	}
-}
-
-
-void LevelLoader::loadLights(LightManager* lm)
-{
-	if (!lightNode.getChildNode("lights").isEmpty())
-	{
-		int nLights = lightNode.getChildNode("lights").nChildNode("light");
-		for (int i=0; i<nLights;i++)
-		{
-			XMLNode t = lightNode.getChildNode("lights").getChildNode("light",i);
-			const char* diffuse = t.getAttribute("diffuse-color");
-			const char* coor = t.getAttribute("abs-coor");
-			lm->addLight(diffuse,coor);	
-		}
-	}
-	lm->setAmbient(lightNode.getChildNode("ambient").getAttribute("color"));	
-}
-
-void LevelLoader::loadCameras(CameraManager* cm)
-{
-	if (!cameraNode.getChildNode("cameras").isEmpty())
-	{
-		int nCameras = cameraNode.getChildNode("cameras").nChildNode("camera");
-		for (int i=0; i<nCameras;i++)
-		{
-			XMLNode t = cameraNode.getChildNode("cameras").getChildNode("camera",i);
-			
-			
-			cm->addCamera();
-		}
-	}
-}
-
-
-void LevelLoader::loadScripts(ScriptManager* sm)
-{
-	if (!scriptNode.getChildNode("scripts").isEmpty())
-	{
-		int nScripts = scriptNode.getChildNode("scripts").nChildNode("script");
-		for (int i=0; i<nScripts;i++)
-		{
-			XMLNode t = scriptNode.getChildNode("scripts").getChildNode("script",i);
-			sm->addScript(t.getAttribute("file"));
-		}
-	
-	}
-}
-*/
-
-
-}
-
Index: code/branches/FICN/src/loader/LevelLoader.h
===================================================================
--- code/branches/FICN/src/loader/LevelLoader.h	(revision 496)
+++ code/branches/FICN/src/loader/LevelLoader.h	(revision 507)
@@ -7,4 +7,5 @@
 
 #include <string>
+#include <vector>
 #include <iostream>
 
@@ -23,4 +24,18 @@
 	class _LoaderExport LevelLoader
 	{
+	public:
+		// Constructors, loads the level file and some information data
+		LevelLoader(string file, string dir="levels");
+		// Destructor
+		~LevelLoader();
+		// Shows a simple loading screen
+		void showLoadingScreen();
+		// Loads all level data
+		void loadLevel();
+	
+		// Getters
+		string name();
+		string description();
+		string image();		
 	private:
 		// Level information
@@ -36,24 +51,11 @@
 		std::string loadingBarHeight_;
 		
+		// Set to true if it was possible to load the level file
 		bool valid_;
 			
+		// Xml-Stuff
 		TiXmlDocument doc;
 		TiXmlElement* rootElement;	
-	public:
 
-		// Constructors
-		LevelLoader(string file, string dir="levels");
-		~LevelLoader();
-		
-		void showLoadingScreen();
-		void loadLevel();
-		
-		// Getters
-		string name();
-		string description();
-		string image();		
-		
-		// Managers 
-		
 			
 	};	
Index: code/branches/FICN/src/loader/Light.cc
===================================================================
--- code/branches/FICN/src/loader/Light.cc	(revision 496)
+++ 	(revision )
@@ -1,27 +1,0 @@
-
-#include "xml/xmlParser.h"
-#include "Light.h"
-
-namespace light
-{								
-	Light::Light()
-	{		
-		
-	}
-
-  Light::~Light()
-  {
-  }
-	
-	Light::Light(XMLNode xml)
-	{
-		this->loadParams(xml);	
-	}
-	
-	void Light::loadParams(XMLNode xml)
-	{
-		// Here comes the tricky part... convert strings to int
-		const char* diffuse = xml.getAttribute("diffuse-color");
-		const char* coor = xml.getAttribute("abs-coor");
-	}
-}
Index: code/branches/FICN/src/loader/Light.h
===================================================================
--- code/branches/FICN/src/loader/Light.h	(revision 496)
+++ 	(revision )
@@ -1,29 +1,0 @@
-
-#include "loader_platform.h"
-#include "xml/xmlParser.h"
-
-#ifndef __MODULE_LIGHT__
-#define __MODULE_LIGHT__
-
-namespace light
-{
-	class _LoaderExport Light
-	{
-	public:      
-		Light();
-		Light(XMLNode xml);
-		~Light();
-		void loadParams(XMLNode xml);
-	
-	private:
-		float diffuseColor_r_;
-		float diffuseColor_g_;
-		float diffuseColor_b_;
-
-		int coord_x_;
-		int coord_y_;
-		int coord_z_;
-	};
-}
-
-#endif
Index: code/branches/FICN/src/loader/LightManager.cc
===================================================================
--- code/branches/FICN/src/loader/LightManager.cc	(revision 496)
+++ 	(revision )
@@ -1,28 +1,0 @@
-
-#include "xml/xmlParser.h"
-#include "LightManager.h"
-
-namespace light
-{
-	LightManager::LightManager()
-	{
-    std::vector<Light> elements_ = *(new std::vector<Light>);
-	}
-	
-	void LightManager::loadParams(XMLNode xml)
-	{
-		if (!xml.isEmpty())
-		{
-			int nLights = xml.nChildNode("light");
-			for (int i=0; i<nLights;i++)
-			{
-				Light l = *(new Light(xml.getChildNode("light",i)));
-        this->elements_.insert(elements_.end(),l);
-			}
-		}		
-		
-	}	
-		
-	
-}
-
Index: code/branches/FICN/src/loader/LightManager.h
===================================================================
--- code/branches/FICN/src/loader/LightManager.h	(revision 496)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#include <vector>
-
-#include "loader_platform.h"
-#include "xml/xmlParser.h"
-#include "Light.h"
-
-#ifndef __MODULE_LIGHTMANAGER__
-#define __MODULE_LIGHTMANAGER__
-
-namespace light
-{
-	class _LoaderExport LightManager
-	{      
-	public:
-		LightManager();
-		~LightManager();
-		void loadParams(XMLNode xml);		
-				
-	private:
-		float ambient_r_;
-		float ambient_g_;
-		float ambient_b_;
-    std::vector<Light> elements_;
-	};
-}
-
-#endif
