Changeset 346 for code/branches/FICN/src/loader/LightManager.cc

Timestamp:

Nov 29, 2007, 4:21:30 PM (17 years ago)

Author:

rgrieder

Message:

• adjusted the entire source to compile under windows visual studio too:
• added some ugly conversions
• changed some illegal code pieces (gcc however accepted it)
• added a few files from reto's framework to evade linker errors (no more dynamic linking)
• inserted some 'return true' to justify the return type
• excluded the levelLoader in the orxonox.cc (couldn't make it work, parsing error)
• wrote about 5 code #branches to compensate for missing usleep() under windows

Location:

code/branches/FICN

Files:

• . (modified) (1 prop)
• src/loader/LightManager.cc (modified) (2 diffs)

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

@@ -7 +7 @@
         LightManager::LightManager()
         {
-                vector<Light> this->elements_ = new vector<Light>;
+    std::vector<Light> elements_ = *(new std::vector<Light>);
         }
         
@@ -14 +14 @@
                 if (!xml.isEmpty())
                 {
-                        int nLights = xml.nChildNode("light");
+                        int nLights = xml.nChildNode((const wchar_t*)"light");
                         for (int i=0; i<nLights;i++)
                         {
-                                Light l = new Light(xml.getChildNode("light",i));
-                                this->elements_.append(l);
+                                Light l = *(new Light(xml.getChildNode((const wchar_t*)"light",i)));
+        this->elements_.insert(elements_.end(),l);
                         }
                 }