Changeset 659 for code/branches/FICN/src/loader/LevelLoader.cc

Timestamp:

Dec 20, 2007, 4:10:08 PM (16 years ago)

Author:

nicolasc

Message:

• a lot of inlining of getfunctions
• set libaudio to shared (not sure, if related: audioplayer + ingame sound == crash!)
• minor space cleanups

File:

• code/branches/FICN/src/loader/LevelLoader.cc (modified) (5 diffs)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -26 +26 @@
  */
 
-#include <string>
-#include <vector>
-#include <iostream>
+// #include <string>
+// #include <vector>
+// #include <iostream>
 #include <algorithm>
 #include <iterator>
@@ -35 +35 @@
 
 #include "LevelLoader.h"
-#include "tinyxml/tinyxml.h"
+// #include "tinyxml/tinyxml.h"
 #include "orxonox/core/CoreIncludes.h"
 #include "orxonox/core/Error.h"
@@ -152 +152 @@
                                 {
                                         tNode = 0;
+          //FIXME something is worng, probably ==
                                         while( tNode = audioElem->IterateChildren( tNode ) )
                                         {
@@ -199 +200 @@
                                  mLoadOverlay->hide();
                         }
-                        
-                        
+
+
                         COUT(0) << "Loading finished!\n\n\n\n\n";
                 }
@@ -211 +212 @@
 
 
-        string LevelLoader::name()
-        {
-                return this->name_;
-        }
-
-        string LevelLoader::description()
-        {
-                return this->description_;
-        }
-
-        string LevelLoader::image()
-        {
-                return this->image_;
-        }
-
 
 }