Changeset 1588 for code/branches/hud/src/core

Timestamp:

Jun 11, 2008, 12:21:42 AM (16 years ago)

Author:

rgrieder

Message:

• added XML loadable HUD
• Radar and navi are not yet done
• explanations follow with when things are finished

Location:

code/branches/hud/src/core

Files:

• BaseObject.cc (modified) (2 diffs)
• BaseObject.h (modified) (1 diff)
• Loader.cc (modified) (1 diff)
• Script.h (modified) (1 diff)

code/branches/hud/src/core/BaseObject.cc

@@ -66 +66 @@
 
     /**
-        @brief load general xml paramters
-    */
-    void BaseObject::loadParams(TiXmlElement* xmlElem)
-    {
-        if (xmlElem->Attribute("name"))
-        {
-            this->setName(xmlElem->Attribute("name"));
-        }
-    }
-
-    /**
         @brief XML loading and saving.
         @param xmlelement The XML-element
@@ -85 +74 @@
     {
         XMLPortParam(BaseObject, "name", setName, getName, xmlelement, mode);
+        XMLPortParam(BaseObject, "visible", setVisibility, isVisible, xmlelement, mode);
+        XMLPortParam(BaseObject, "active", setActivity, isActive, xmlelement, mode);
     }
 

code/branches/hud/src/core/BaseObject.h

@@ -52 +52 @@
             BaseObject();
             virtual ~BaseObject();
-            virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 

code/branches/hud/src/core/Loader.cc

@@ -116 +116 @@
         Script::run();*/
         Script* lua = Script::getInstance();
+        lua->clearLuaOutput();
         lua->loadFile(level->getFile(), true);
         lua->run();

code/branches/hud/src/core/Script.h

@@ -72 +72 @@
     inline std::string getLuaOutput() { return output_; };
     //inline std::string* getFileString() { return &fileString_; };
+    inline void clearLuaOutput() { output_ = ""; }
 
     unsigned int getNextQuote(const std::string& text, unsigned int start);