Changeset 9303

Timestamp:

Jun 17, 2012, 6:38:14 PM (12 years ago)

Author:

landauf

Message:

added warning if a template is used on a different type than it was defined for. this doesn't matter technically, but it's misleading.
fixed template type of ShrinkPickups

Location:

code/branches/presentation2012merge

Files:

• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (3 diffs)
• src/libraries/core/Template.cc (modified) (1 diff)

code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -491 +491 @@
 
 <Template name=smallshrinkpickup>
-  <InvisiblePickup 
+  <ShrinkPickup 
     duration = 10.0
     shrinkFactor = 2.5
@@ -516 +516 @@
 
 <Template name=mediumshrinkpickup>
-  <InvisiblePickup 
+  <ShrinkPickup 
     duration = 30.0
     shrinkFactor = 5.0
@@ -541 +541 @@
 
 <Template name=hugeshrinkpickup>
-  <InvisiblePickup 
+  <ShrinkPickup 
     duration = 60.0
     shrinkFactor = 10.0

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

@@ -149 +149 @@
         orxout(verbose, context::templates) << object->getLoaderIndentation() << " aplying Template \"" << this->getName() << "\"..." << endl;
 
+        // check if the template is applied on an object of the right type
+        Identifier* identifier = Identifier::getIdentifierByString(this->getXMLElement().Value());
+        if (!object->getIdentifier()->isA(identifier))
+            orxout(internal_warning, context::templates) << "Template was defined for " << identifier->getName() << " but the object is of type " << object->getIdentifier()->getName() << endl;
+
         Element temp = &const_cast<TiXmlElement&>(this->getXMLElement());