Changeset 9127 for code/branches/shipSelection/src

Timestamp:

Apr 27, 2012, 3:56:15 PM (13 years ago)

Author:

huttemat

Message:

shipselection core works now

Location:

code/branches/shipSelection/src

Files:

• libraries/core/Loader.cc (modified) (1 diff)
• orxonox/LevelInfo.h (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (1 diff)

code/branches/shipSelection/src/libraries/core/Loader.cc

@@ -222 +222 @@
 
             orxout(verbose, context::loader) << "Namespace-tree:" << '\n' << rootNamespace->toString("  ") << endl;
-
+                        
             return true;
         }

code/branches/shipSelection/src/orxonox/LevelInfo.h

@@ -152 +152 @@
 
         private:
+
             inline void changeShip (const std::string& model) {
-                //HACK: Read Level XML File, find "shipselection", replace with ship model
-                std::string text;
-                std::ifstream myLevel ("test.txt");
-                std::ofstream tempLevel ("test2.txt");
-                while(!myLevel.eof())
-                {
-                        std::string buff;
-                        std::getline(myLevel, buff);
-                        tempLevel.write(buff.c_str(), buff.length());
-                }
-                myLevel.close();
-                tempLevel.close();
-                orxout(user_status) << "done" << endl;
+                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.

code/branches/shipSelection/src/orxonox/LevelManager.cc

@@ -256 +256 @@
         {
             // TODO: Replace with tag?
-            if (it->find("old/") != 0)
+            if (it->find("old/") != 0 )
             {
                 LevelInfoItem* info = NULL;