Changeset 10053 for code/branches/modularships/src/orxonox/items/PartDestructionEvent.h

Timestamp:

May 13, 2014, 11:45:47 AM (11 years ago)

Author:

noep

Message:

Fixed yet another segfault (which we hadn't seen yet).
Cleared emptyLevel, created two testlevels (testing with boxes)

File:

• code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) (4 diffs)

code/branches/modularships/src/orxonox/items/PartDestructionEvent.h

@@ -44 +44 @@
         public:
 
+            enum TargetParam
+            {
+                shieldhealth,
+                maxshieldhealth,
+                shieldabsorption,
+                shieldrechargerate,
+                null
+            };
+
             PartDestructionEvent(Context* context);
             virtual ~PartDestructionEvent();
@@ -50 +59 @@
 
             void execute();
+
+            inline void setValid(bool valid)
+                { this->valid_ = valid; }
+            inline bool isValid()
+                { return this->valid_; }
+
+            void setParent(ShipPart* parent);
+            inline ShipPart* getParent()
+                { return this->parent_; }
 
             void setTargetType(std::string type);
@@ -67 +85 @@
                 { return this->operation_; }
 
+            float operate(float input);
+
             void setEventValue(float value);
             inline float getEventValue()
@@ -75 +95 @@
         private:
 
-            bool isValid_;
+            ShipPart* parent_;
+            bool valid_;
 
             std::string targetType_;
             std::string targetName_;
-            std::string targetParam_;
+            TargetParam targetParam_;
             std::string operation_;