Changeset 6938 for code/branches/presentation3

Timestamp:

May 20, 2010, 4:35:48 PM (15 years ago)

Author:

dafrick

Message:

Resolved issue with lod-template. Now, template inherit the "defaults"-parameter of templates they link. Empty level should work now.

Location:

code/branches/presentation3

Files:

• data/levels/templates/lodinformation.oxt (modified) (1 diff)
• src/libraries/core/Template.cc (modified) (2 diffs)
• src/libraries/core/Template.h (modified) (1 diff)

code/branches/presentation3/data/levels/templates/lodinformation.oxt

@@ -1 @@
-<Template name=lodtemplate_default defaults=0>
+<Template name=lodtemplate_default defaults=false>
   <Level>
         <lodinformation>

code/branches/presentation3/src/libraries/core/Template.cc

@@ -99 +99 @@
     }
 
-    const TiXmlElement& Template::getXMLElement() const
+    const TiXmlElement& Template::getXMLElement()
     {
         if (this->bIsLink_)
@@ -106 +106 @@
             if (temp)
             {
+                this->bLoadDefaults_ = temp->bLoadDefaults_;
+                
                 if (!temp->bIsReturningXMLElement_)
                 {

code/branches/presentation3/src/libraries/core/Template.h

@@ -58 +58 @@
 
             void setXMLElement(const TiXmlElement& xmlelement);
-            const TiXmlElement& getXMLElement() const;
+            const TiXmlElement& getXMLElement();
 
             void setBaseclass(const std::string& baseclass);