Changeset 6109 in orxonox.OLD for branches

Timestamp:

Dec 14, 2005, 3:44:23 PM (19 years ago)

Author:

manuel

Message:

some debugging

Location:

branches/powerups/src

Files:

• Makefile.am (modified) (1 diff)
• world_entities/power_ups/param_power_up.cc (modified) (3 diffs)
• world_entities/power_ups/param_power_up.h (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/powerups/src/Makefile.am

@@ -80 +80 @@
                   world_entities/power_ups/laser_power_up.cc \
                   world_entities/power_ups/weapon_power_up.cc \
+                  world_entities/power_ups/param_power_up.cc \
                   world_entities/space_ships/space_ship.cc \
                   subprojects/benchmark.cc

branches/powerups/src/world_entities/power_ups/param_power_up.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "weapon_power_up.h"
+#include "param_power_up.h"
 #include "factory.h"
 #include "state.h"
@@ -29 +29 @@
 
 CREATE_FACTORY(ParamPowerUp, CL_PARAM_POWER_UP);
+
+const char* ParamPowerUp::paramTypes[] = {
+  "shield"
+};
 
 ParamPowerUp::ParamPowerUp () : PowerUp(0.0, 0.0, 1.0)
@@ -112 +116 @@
 }
 
-const char* ParamPowerUp::paramTypes[] = {
-  "shield"
-};
 
-

branches/powerups/src/world_entities/power_ups/param_power_up.h

@@ -24 +24 @@
 
   void setValue(int value);
-  void setType(EnumParamPowerUpType type)
+  void setMaxValue(int value);
+  void setMinValue(int value);
+  void setType(const char* type);
+  EnumParamPowerUpType getType();
+  int getValue();
 
 protected:
@@ -34 +38 @@
 
 private:
-  static const char* paramTypes;
+  static const char* paramTypes[];
   EnumParamPowerUpType type;
   int value;

branches/powerups/src/world_entities/space_ships/space_ship.cc

@@ -34 +34 @@
 
 #include "power_ups/weapon_power_up.h"
+#include "power_ups/param_power_up.h"
 
 #include "graphics_engine.h"
@@ -428 +429 @@
   }
   else if(powerUp->isA(CL_PARAM_POWER_UP)) {
-
+    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
+    switch(ppu->getType()) {
+      case PARAM_SHIELD:
+        break;
+    }
   }
   return false;