Changeset 6243 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• world_entities/power_ups/param_power_up.cc (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (3 diffs)
• world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.h (modified) (3 diffs)

trunk/src/defs/class_id.h

@@ -74 +74 @@
 
   // subsuper-classes derivations taken : 1, 2, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
+
   // subsuper-classes
   CL_MASK_SUBSUPER_CLASS        =    0x00fff000,
@@ -87 +88 @@
   CL_WEAPON                     =    0x00210000,
   CL_POWER_UP                   =    0x00220000,
-  CL_EXTENDABLE                  =    0x00220000,
-
+  CL_EXTENDABLE                 =    0x00240000,
   // SUPER-Modeling
   CL_TEXTURE                    =    0x00c01000,

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"

trunk/src/world_entities/space_ships/space_ship.cc

@@ -31 +31 @@
 #include "key_mapper.h"
 #include "event_handler.h"
+
+#include "power_ups/weapon_power_up.h"
+#include "power_ups/param_power_up.h"
 
 #include "graphics_engine.h"
@@ -432 +435 @@
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
     this->getWeaponManager()->previousWeaponConfig();
-
   else if( event.type == SDLK_w)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);
@@ -445 +447 @@
      //this->setAbsDir(mouseDir);
   }
+}
+
+/**
+ *
+ */
+bool SpaceShip::pickup(PowerUp* powerUp)
+{
+  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
+    Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
+    WeaponManager* manager = this->getWeaponManager();
+    int slot = manager->getNextFreeSlot(0, weapon->getCapability());
+    if(slot >= 0) {
+      manager->addWeapon(weapon, 0, slot);
+      return true;
+    }
+  }
+  else if(powerUp->isA(CL_PARAM_POWER_UP)) {
+    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
+    switch(ppu->getType()) {
+      case PARAM_SHIELD:
+        break;
+    }
+  }
+  return false;
 }
 

trunk/src/world_entities/space_ships/space_ship.h

@@ -8 +8 @@
 
 #include "playable.h"
+#include "extendable.h"
 
 
@@ -14 +15 @@
 class Event;
 
-class SpaceShip : public Playable
+class SpaceShip : public Playable, public Extendable
 {
 
@@ -41 +42 @@
 
     virtual void process(const Event &event);
-
+    bool pickup(PowerUp* powerUp);