Changeset 10071

Timestamp:

May 22, 2014, 2:18:47 PM (10 years ago)

Author:

noep

Message:

Removed all segfaults (or at least those we found…)

Location:

code/branches/modularships/src/orxonox

Files:

• items/PartDestructionEvent.cc (modified) (1 diff)
• items/ShipPart.cc (modified) (4 diffs)
• items/ShipPart.h (modified) (2 diffs)
• worldentities/pawns/ModularSpaceShip.cc (modified) (3 diffs)
• worldentities/pawns/ModularSpaceShip.h (modified) (1 diff)

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

@@ -143 +143 @@
             switch (this->targetParam_) {
             case null:
+                if (!this->parent_->getParent()->getShipPartByName(targetName_))
+                    return;
                 this->parent_->getParent()->getShipPartByName(targetName_)->setEventExecution(false);
                 this->parent_->getParent()->killShipPart(targetName_);

code/branches/modularships/src/orxonox/items/ShipPart.cc

@@ -55 +55 @@
         this->setAlive(true);
         this->setEventExecution(true);
+        this->healthMem_ = 100;
     }
 
@@ -102 +103 @@
         // Remove this ShipPart from the parent.
         this->parent_->removeShipPart(this);
+        delete this;
     }
 
@@ -201 +203 @@
     {
         this->health_ = health;
+    }
+
+    void ShipPart::setAlive(bool var)
+    {
+        this->alive_ = var;
+        orxout() << "ShipPart " << this->getName() << " alive_: " << this->alive_ << endl;
     }
 
@@ -236 +244 @@
 
         // (Ugly) Chatoutput of health, until a GUI for modularspaceships-shipparts is implemented.
-        if (this->health_ < 0.2 * this->maxHealth_)
-        {
+        if ((this->health_ < 0.2 * this->maxHealth_) && (this->healthMem_ == 40))
+        {
+            this->healthMem_ = 20;
             ChatManager::message("ShipPart " + this->getName() + " remaining health is 20%!");
             return;
         }
-        if (this->health_ < 0.4 * this->maxHealth_)
-        {
+        if ((this->health_ < 0.4 * this->maxHealth_) && (this->healthMem_ == 60))
+        {
+            this->healthMem_ = 40;
             ChatManager::message("ShipPart " + this->getName() + " remaining health is 40%!");
             return;
         }
-        if (this->health_ < 0.6 * this->maxHealth_)
-        {
+        if ((this->health_ < 0.6 * this->maxHealth_) && (this->healthMem_ == 80))
+        {
+            this->healthMem_ = 60;
             ChatManager::message("ShipPart " + this->getName() + " remaining health is 60%!");
             return;
         }
-        if (this->health_ < 0.8 * this->maxHealth_)
-        {
+        if ((this->health_ < 0.8 * this->maxHealth_) && (this->healthMem_ == 100))
+        {
+            this->healthMem_ = 80;
             ChatManager::message("ShipPart " + this->getName() + " remaining health is 80%!");
             return;

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

@@ -72 +72 @@
                 { return this->parent_; }
 
-            inline void setAlive(bool var)
-                { this->alive_ = var; }
+            void setAlive(bool var);
             inline bool isAlive()
                 { return this->alive_; }
@@ -125 +124 @@
             bool eventExecution_;
 
+            float healthMem_;
+
             Vector3 explosionPosition_;
 

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -50 +50 @@
 namespace orxonox
 {
-    SetConsoleCommand("ModularSpaceShip", "killshippart", &ModularSpaceShip::killShipPart);
+    SetConsoleCommand("ModularSpaceShip", "killshippart", &ModularSpaceShip::killShipPartStatic);
 
     RegisterClass(ModularSpaceShip);
@@ -174 +174 @@
     /**
     @brief
+        STATIC: Needed for consolecommand. Kills the ShipPart with the given name. Used from the console-command "ModularSpaceShip killshippart [string]".
+    @param name
+        The name of the part to be killed.
+    */
+    void ModularSpaceShip::killShipPartStatic(std::string name)
+    {
+        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = ModularSpaceShip::partMap_s->begin(); it != ModularSpaceShip::partMap_s->end(); ++it)
+        {
+            if (it->second->getName() == name)
+            {
+                it->second->setAlive(false);
+                return;
+            }
+        }
+        orxout(internal_warning) << "Could not apply damage to ShipPart \"" << name << "\". Part not found." << endl;
+    }
+
+    /**
+    @brief
         Kills the ShipPart with the given name. Used from the console-command "ModularSpaceShip killshippart [string]".
     @param name
@@ -180 +199 @@
     void ModularSpaceShip::killShipPart(std::string name)
     {
-        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = ModularSpaceShip::partMap_s->begin(); it != ModularSpaceShip::partMap_s->end(); ++it)
+        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = ModularSpaceShip::partMap_.begin(); it != ModularSpaceShip::partMap_.end(); ++it)
         {
             if (it->second->getName() == name)
             {
-                it->second->death();
+                it->second->setAlive(false);
                 return;
             }

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h

@@ -113 +113 @@
             virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = NULL, const btCollisionShape* cs = NULL);
 
-            static void killShipPart(std::string name);
+            static void killShipPartStatic(std::string name);
+            void killShipPart(std::string name);
 
             void addShipPart(ShipPart* part);