Changeset 6243 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Dec 21, 2005, 3:41:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the power-ups to the tunk again

Location:

trunk/src/world_entities/power_ups

Files:

• param_power_up.cc (modified) (1 diff)
• power_up.cc (modified) (3 diffs)
• weapon_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
+#include "list.h"
 
 #include "primitive_model.h"

trunk/src/world_entities/power_ups/power_up.cc

@@ -27 +27 @@
 PowerUp::PowerUp(float r, float g, float b)
 {
+  this->respawnType = RESPAWN_NONE;
   if(!PowerUp::sphereModel) {
     PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
@@ -33 +34 @@
   this->sphereMaterial->setTransparency(.1);
   this->sphereMaterial->setDiffuse(r, g, b);
-
   this->toList(OM_COMMON);
 }
@@ -90 +90 @@
 {
   for(int i = 0; i < RESPAWN_size; ++i) {
-    if(strcmp(type, respawnTypes[i]) == 0) {
+    if(!strcmp(type, respawnTypes[i])) {
       this->respawnType = (PowerUpRespawn)i;
       break;

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
+#include "list.h"
 
 #include "primitive_model.h"