Changeset 5603 in orxonox.OLD

Timestamp:

Nov 16, 2005, 3:19:47 PM (18 years ago)

Author:

stefalie

Message:

WorldEntities: Fixed bugs in bomb class

Location:

branches/world_entities/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/weapons/bomb.cc (modified) (5 diffs)
• world_entities/weapons/bomb.h (modified) (3 diffs)

branches/world_entities/src/defs/class_id.h

@@ -141 +141 @@
   CL_ROCKET                     =    0x00000241,
   CL_LASER                      =    0x00000242,
+  CL_BOMB                       =    0x00000243,
 
 

branches/world_entities/src/world_entities/weapons/bomb.cc

@@ -15 +15 @@
 
 #include "bomb.h"
+#include "glincl.h"
+#include "model.h"
+#include "fast_factory.h"
 
 using namespace std;
 
+CREATE_FAST_FACTORY_STATIC(Bomb, CL_BOMB);
 
 /**
@@ -46 +50 @@
 void Bomb::init()
 {
-  this->setClassID(CL_PROTO_WORLD_ENTITY, "Bomb");
+  this->setClassID(CL_BOMB, "Bomb");
 
   /**
@@ -63 +67 @@
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
-  static_cast<WorldEntity*>(this)->loadParam(root);
+  static_cast<WorldEntity*>(this)->loadParams(root);
 
 
@@ -76 +80 @@
  * @param time the Time to step
  */
-Bomb::tick(float time)
+void Bomb::tick(float time)
 {
 
@@ -112 +116 @@
 
 }
+
+void Bomb::activate()
+{
+
+}
+
+void Bomb::deactivate()
+{
+
+}

branches/world_entities/src/world_entities/weapons/bomb.h

@@ -4 +4 @@
 */
 
-#ifndef BOMB
-#define BOMB
+#ifndef _BOMB_H
+#define _BOMB_H
 
-#include "bomb.h"
+#include "projectile.h"
+class FastFactory;
 
 //! A Class to ...
@@ -20 +21 @@
   void init();
 
-  virtual void postSpawn ();
-  virtual void leftWorld ();
+//  virtual void postSpawn ();
+//  virtual void leftWorld ();
 
 
@@ -27 +28 @@
   virtual void tick(float time);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
+  virtual void activate();
+  virtual void deactivate();
 
  private:
+  static FastFactory*               fastFactory;
 
 };