Index: code/branches/presentation2012merge/src/orxonox/LevelInfo.h
===================================================================
--- code/branches/presentation2012merge/src/orxonox/LevelInfo.h	(revision 9269)
+++ code/branches/presentation2012merge/src/orxonox/LevelInfo.h	(revision 9272)
@@ -24,5 +24,5 @@
  *   Co-authors:
  *      ...
- *   
+ *
  */
 
@@ -79,5 +79,5 @@
             */
             inline const std::string& getName(void) const { return this->name_; } // tolua_export
-        
+
             /**
             @brief Set the screenshot of the Level.
@@ -117,5 +117,5 @@
             */
             inline bool hasTag(const std::string& tag) const { return this->tags_.find(tag) != this->tags_.end(); } // tolua_export
- 
+
             void setShips(const std::string& ships); //!< Set the starting ship models of the level
             bool addShip(const std::string& ship, bool update = true); //!< Add a model to shipselection
@@ -125,5 +125,5 @@
             */
             inline const std::string& getShips(void) const
-                { return this->startingShipsString_; }    
+                { return this->startingShipsString_; }
             /**
             @brief Get whether the Level allows a specific starting ship model
@@ -131,5 +131,5 @@
             @return Returns true if the Level allows the input ship model
             */
-            inline bool hasShip(const std::string& ship) const { return this->ships_.find(ship) != this->ships_.end(); } // tolua_export        
+            inline bool hasShip(const std::string& ship) const { return this->ships_.find(ship) != this->ships_.end(); } // tolua_export
             /**
             @brief Get the XML-filename of the Level.
@@ -138,5 +138,5 @@
 
             inline const std::string& getXMLFilename(void) const { return this->xmlfilename_; } // tolua_export
-	    inline void selectShip (const std::string& ship) { this->changeShip(ship); } // tolua_export
+            inline void selectShip (const std::string& ship) { this->changeShip(ship); } // tolua_export
 
 
@@ -153,30 +153,30 @@
         private:
 
-	    inline void changeShip (const std::string& model) {
-	        static std::string shipSelectionTag = "shipselection";
-        	//HACK: Read Level XML File, find "shipselection", replace with ship model
-        	std::string levelPath = "../levels/";
-        	levelPath.append(this->getXMLFilename());
-        	std::string tempPath = "../levels/";
-        	tempPath.append("_temp.oxw");
-        	orxout(user_status) << levelPath << endl;
-        	orxout(user_status) << tempPath << endl;
-        	std::ifstream myLevel (levelPath.c_str());
-			std::ofstream tempLevel (tempPath.c_str());
-			while(!myLevel.eof())
-			{
-				std::string buff;
-				std::getline(myLevel, buff);
-				std::string pawndesignString = "pawndesign=";
-				size_t found = buff.find(pawndesignString.append(shipSelectionTag)); 
-				if (found!= std::string::npos) 
-					buff = buff.substr(0, found + 11) + model + buff.substr(found+11+shipSelectionTag.length(), std::string::npos);
-				tempLevel.write(buff.c_str(), buff.length());
-				tempLevel << std::endl;
-			}
-			myLevel.close();
-			tempLevel.close();
-			orxout(user_status) << "done" << endl;
-	    } 
+            inline void changeShip (const std::string& model) {
+                static std::string shipSelectionTag = "shipselection";
+                //HACK: Read Level XML File, find "shipselection", replace with ship model
+                std::string levelPath = "../levels/";
+                levelPath.append(this->getXMLFilename());
+                std::string tempPath = "../levels/";
+                tempPath.append("_temp.oxw");
+                orxout(user_status) << levelPath << endl;
+                orxout(user_status) << tempPath << endl;
+                std::ifstream myLevel (levelPath.c_str());
+                std::ofstream tempLevel (tempPath.c_str());
+                while(!myLevel.eof())
+                {
+                    std::string buff;
+                    std::getline(myLevel, buff);
+                    std::string pawndesignString = "pawndesign=";
+                    size_t found = buff.find(pawndesignString.append(shipSelectionTag));
+                    if (found!= std::string::npos)
+                        buff = buff.substr(0, found + 11) + model + buff.substr(found+11+shipSelectionTag.length(), std::string::npos);
+                    tempLevel.write(buff.c_str(), buff.length());
+                    tempLevel << std::endl;
+                }
+                myLevel.close();
+                tempLevel.close();
+                orxout(user_status) << "done" << endl;
+            }
             void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
             void shipsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
@@ -199,5 +199,5 @@
             std::string tagsString_; //!< The comma-seperated string of all the tags the Level is tagged with.
             std::set<std::string> ships_; //!< The set of starting ship models the Level allows.
-            std::string startingShipsString_; //!< The comma-seperated string of all the allowed ship models for the shipselection.            
+            std::string startingShipsString_; //!< The comma-seperated string of all the allowed ship models for the shipselection.
     }; // tolua_export
 
@@ -210,5 +210,5 @@
         - @b screenshot The screenshot of the level.
         - @b tags A comma-seperated string of tags. Allowed tags are: <em>test</em>, <em>singleplayer</em>, <em>multiplayer</em>, <em>showcase</em>, <em>tutorial</em>, <em>presentation</em>, <em>shipselection</em>.
-        - @b (optional) startingships The comma-seperated string of starting ship models 
+        - @b (optional) startingships The comma-seperated string of starting ship models
         An example would be:
         @code
@@ -224,6 +224,6 @@
     @author
         Damian 'Mozork' Frick
-	@edit
-		Matthias Hutter
+    @edit
+        Matthias Hutter
     @ingroup Orxonox
     */
@@ -235,5 +235,5 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a LevelInfo object through XML.
-        
+
             /**
             @brief Set the screenshot of the Level.
@@ -283,5 +283,5 @@
             */
             inline const std::string& getShips(void) const
-                { return this->LevelInfoItem::getShips(); }              
+                { return this->LevelInfoItem::getShips(); }
             LevelInfoItem* copy(void); //!< Copies the contents of this LevelInfo object to a new LevelInfoItem object.
     };
@@ -302,5 +302,5 @@
             }
     };
-    
+
 } // tolua_export
 
