[Orxonox-commit 7032] r11651 - code/branches/SOBv2_HS17/src/modules/superorxobros

[zarron at orxonox.net]

Author: zarron
Date: 2017-12-11 14:20:57 +0100 (Mon, 11 Dec 2017)
New Revision: 11651

Modified:
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h
Log:
Boss spawned Gumbas have now max lifetime

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc	2017-12-11 13:14:15 UTC (rev 11650)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc	2017-12-11 13:20:57 UTC (rev 11651)
@@ -60,6 +60,8 @@
         changeAllowed_ = true;
         changedOn_ = 0.0;
         creator_ = nullptr;
+        maxLifetime_ = 10;
+        lifetime_ = 0;
         
     }
 
@@ -110,7 +112,7 @@
         if (!changeAllowed_) {
             changedOn_+= dt;
             // After a collision, we don't listen for collisions for 200ms - that's because one wall can cause several collisions!
-            if (changedOn_> 0.200) {
+            if (changedOn_> 0.400) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;
 
@@ -133,5 +135,14 @@
 
         lastPos_ = getPosition();
 
+        if (creator_ != nullptr)
+        {
+            lifetime_ += dt;
+            if(lifetime_>maxLifetime_)
+            {
+                this->destroyLater();
+            }
+        }
+
     }
 }

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h	2017-12-11 13:14:15 UTC (rev 11650)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h	2017-12-11 13:20:57 UTC (rev 11651)
@@ -69,6 +69,8 @@
             Vector3 lastPos_;
             bool changeAllowed_;
             float changedOn_;
+            float maxLifetime_;
+            float lifetime_;
 
            
     };