Changeset 6973 in orxonox.OLD for trunk/src/world_entities/power_ups/power_up.cc

Timestamp:

Feb 2, 2006, 10:20:16 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: added powerups

File:

• trunk/src/world_entities/power_ups/power_up.cc (modified) (7 diffs)

trunk/src/world_entities/power_ups/power_up.cc

@@ -21 +21 @@
 #include "primitive_model.h"
 
-#include "assert.h"
+#include "load_param.h"
 
 using namespace std;
@@ -29 +29 @@
   this->setClassID(CL_POWER_UP, "PowerUp");
 
-  this->respawnType = RESPAWN_NONE;
+  this->respawnType = RESPAWN_TIME;
   this->respawnStart = 10;
   this->model = NULL;
@@ -39 +39 @@
   this->buildObbTree( 4);
   this->sphereMaterial = new Material;
-  this->sphereMaterial->setTransparency(.1);
+  this->sphereMaterial->setTransparency(.8);
   this->sphereMaterial->setDiffuse(r, g, b);
   this->toList(OM_COMMON);
@@ -53 +53 @@
 {
   WorldEntity::loadParams(root);
+  LoadParam(root, "respawnType", this, PowerUp, setRespawnType);
+  LoadParam(root, "respawnTime", this, PowerUp, setRespawnTime);
 }
 
@@ -62 +64 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
-      this->respawnTime = this->respawnStart;
-      this->toList(OM_DEAD_TICK);
+      switch(respawnType) {
+        case RESPAWN_NONE:
+          this->toList(OM_DEAD);
+          break;
+        case RESPAWN_TIME:
+          this->toList(OM_DEAD_TICK);
+          this->respawnTime = this->respawnStart;
+          break;
+      }
     }
   }
@@ -72 +81 @@
     this->respawnTime -= dt;
     if(this->respawnTime <= 0) {
-      this->respawn();
       this->toList(OM_COMMON);
     }
@@ -110 +118 @@
 }
 
+void PowerUp::setRespawnTime(const float respawnTime)
+{
+  this->respawnStart = respawnTime;
+}