Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5603 in orxonox.OLD for branches/world_entities/src


Ignore:
Timestamp:
Nov 16, 2005, 3:19:47 PM (19 years ago)
Author:
stefalie
Message:

WorldEntities: Fixed bugs in bomb class

Location:
branches/world_entities/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/world_entities/src/defs/class_id.h

    r5527 r5603  
    141141  CL_ROCKET                     =    0x00000241,
    142142  CL_LASER                      =    0x00000242,
     143  CL_BOMB                       =    0x00000243,
    143144
    144145
  • branches/world_entities/src/world_entities/weapons/bomb.cc

    r5590 r5603  
    1515
    1616#include "bomb.h"
     17#include "glincl.h"
     18#include "model.h"
     19#include "fast_factory.h"
    1720
    1821using namespace std;
    1922
     23CREATE_FAST_FACTORY_STATIC(Bomb, CL_BOMB);
    2024
    2125/**
     
    4650void Bomb::init()
    4751{
    48   this->setClassID(CL_PROTO_WORLD_ENTITY, "Bomb");
     52  this->setClassID(CL_BOMB, "Bomb");
    4953
    5054  /**
     
    6367{
    6468  // all the clases this Entity is directly derived from must be called in this way, to load all settings.
    65   static_cast<WorldEntity*>(this)->loadParam(root);
     69  static_cast<WorldEntity*>(this)->loadParams(root);
    6670
    6771
     
    7680 * @param time the Time to step
    7781 */
    78 Bomb::tick(float time)
     82void Bomb::tick(float time)
    7983{
    8084
     
    112116
    113117}
     118
     119void Bomb::activate()
     120{
     121
     122}
     123
     124void Bomb::deactivate()
     125{
     126
     127}
  • branches/world_entities/src/world_entities/weapons/bomb.h

    r5593 r5603  
    44*/
    55
    6 #ifndef BOMB
    7 #define BOMB
     6#ifndef _BOMB_H
     7#define _BOMB_H
    88
    9 #include "bomb.h"
     9#include "projectile.h"
     10class FastFactory;
    1011
    1112//! A Class to ...
     
    2021  void init();
    2122
    22   virtual void postSpawn ();
    23   virtual void leftWorld ();
     23//  virtual void postSpawn ();
     24//  virtual void leftWorld ();
    2425
    2526
     
    2728  virtual void tick(float time);
    2829  virtual void collidesWith (WorldEntity* entity, const Vector& location);
     30  virtual void activate();
     31  virtual void deactivate();
    2932
    3033 private:
     34  static FastFactory*               fastFactory;
    3135
    3236};
Note: See TracChangeset for help on using the changeset viewer.