Changeset 5871 in orxonox.OLD

Timestamp:

Dec 2, 2005, 3:00:24 PM (18 years ago)

Author:

manuel

Message:

declared extendable

Location:

branches/powerups/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/sound/sound_engine.cc (modified) (1 diff)
• world_entities/extendable.cc (copied) (copied from branches/powerups/src/proto/proto_class.cc)
• world_entities/extendable.h (copied) (copied from branches/powerups/src/proto/proto_class.h) (3 diffs)
• world_entities/power_ups/power_up.cc (modified) (2 diffs)
• world_entities/power_ups/power_up.h (modified) (1 diff)

branches/powerups/src/defs/class_id.h

@@ -74 +74 @@
 
 
+
   // subsuper-classes
   CL_MASK_SUBSUPER_CLASS        =    0x00fff000,
@@ -84 +85 @@
   CL_PROJECTILE                 =    0x00110000,
   CL_WEAPON                     =    0x00120000,
-
+  CL_EXTENDABLE                 =    0x00140000,
   // subsuper-classes derivations taken : 1, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
 

branches/powerups/src/lib/sound/sound_engine.cc

@@ -281 +281 @@
 
   // INITIALIZING THE DEVICE:
-  ALchar deviceName[] =
+  ALubyte deviceName[] =
 #ifdef __WIN32__
       "native";

branches/powerups/src/world_entities/extendable.h

@@ -4 +4 @@
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
-
-#include "base_object.h"
+#ifndef _EXTENDABLE_H
+#define _EXTENDABLE_H
 
 // FORWARD DECLARATION
@@ -14 +12 @@
 
 //! A class for ...
-class ProtoClass : public BaseObject {
+class Extendable : public BaseObject {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
-
+//   Extendable();
+//   virtual ~Extendable();
+  virtual bool pickup(PowerUp* powerUp) { return false; }
 
  private:
@@ -25 +23 @@
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _EXTENDABLE_H */

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

@@ -18 +18 @@
 
 #include "power_up.h"
+#include "extendable.h"
 
 
@@ -24 +25 @@
 
 
-PowerUp::PowerUp ()
+PowerUp::PowerUp (PowerUpType type)
 {
-  this->setClassID(CL_POWER_UP, "PowerUp");
-
+  this->init();
 }
 
+PowerUp::PowerUp(const TiXmlElement* root)
+{
+  this->init();
+  this->loadParams(root);
+}
 
+void PowerUp::init() {
+  this->setClassID(CL_POWER_UP, "PowerUp");
+  this->type = type;
+}
 
 PowerUp::~PowerUp () {}
 
 
-void PowerUp::loadParam(const TiXmlElement* root)
+void PowerUp::loadParams(const TiXmlElement* root)
 {
   static_cast<WorldEntity*>(this)->loadParams(root);
-
 }
 
+
+void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
+{
+ if(entity->isA(CL_EXTENDABLE))
+  {
+    if(dynamic_cast<Extendable*>(entity)->pickup(this))
+    {
+      this->setVisibiliy(false);
+    }
+  }
+}

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

@@ -9 +9 @@
 #include "world_entity.h"
 
+typedef enum PowerUpType
+{
+  PWR_UP_NULL,
+  PWR_UP_SHIELD,
+  PWR_UP_WEAPON,
+} PowerUpType;
+
 class PowerUp : public WorldEntity {
 
- public:
-  PowerUp ();
+public:
+  PowerUp(PowerUpType type = PWR_UP_NULL);
+  PowerUp(const TiXmlElement* root);
   virtual ~PowerUp ();
-  void loadParam(const TiXmlElement* root);
+  void loadParams(const TiXmlElement* root);
+  void collidesWith (WorldEntity* entity, const Vector& location);
+
+private:
+  PowerUpType type;
+  void init();
 };