Changeset 11444 for code/branches/Presentation_FS17/src

Timestamp:

May 30, 2017, 2:58:20 PM (8 years ago)

Author:

patricwi

Message:

merged Boss Level

Location:

code/branches/Presentation_FS17

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/IceGun.cc (modified) (1 diff)
• src/orxonox/items/PartDestructionEvent.cc (modified) (2 diffs)

code/branches/Presentation_FS17/src/modules/weapons/weaponmodes/IceGun.cc

@@ -51 +51 @@
         RegisterObject(IceGun);
 
-        // Default values
+        // Default val
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;

code/branches/Presentation_FS17/src/orxonox/items/PartDestructionEvent.cc

@@ -69 +69 @@
         XMLPortParam(PartDestructionEvent, "value", setEventValue, getEventValue, xmlelement, mode).defaultValues(0);
         XMLPortParam(PartDestructionEvent, "message", setMessage, getMessage, xmlelement, mode).defaultValues("NULL");
+        //MLPortPAram(PartDestructionEvent, "spawn", setSpawn, getSpawn, xmlelement, mode).defaultValues("NULL");
 
         /*
@@ -100 +101 @@
             case TargetParam::shieldhealth:
                 this->parent_->getParent()->setShieldHealth(operate(this->parent_->getParent()->getShieldHealth()));
+                break;
+            case TargetParam::maxshieldhealth:
+                this->parent_->getParent()->setMaxShieldHealth(operate(this->parent_->getParent()->getMaxShieldHealth()));
                 break;
             case TargetParam::boostpower: