Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4746 in orxonox.OLD for orxonox/trunk/src/world_entities


Ignore:
Timestamp:
Jul 1, 2005, 12:48:48 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: changed (void) → ()

Location:
orxonox/trunk/src/world_entities
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/world_entities/camera.cc

    r4490 r4746  
    3333   \brief creates a Camera
    3434*/
    35 Camera::Camera(void)
     35Camera::Camera()
    3636{
    3737  this->setClassID(CL_CAMERA, "Camera");
    … …  
    5555   \brief default destructor
    5656*/
    57 Camera::~Camera(void)
     57Camera::~Camera()
    5858{
    5959  EventHandler::getInstance()->unsubscribe(this);
    … …  
    7272   \returns The PNode of the Target (from there you can get position and so on
    7373*/
    74 PNode* Camera::getTarget(void)
     74PNode* Camera::getTarget()
    7575{
    7676  return (PNode*)this->target;

  • orxonox/trunk/src/world_entities/camera.h

    r4592 r4746  
    3333{
    3434 public:
    35   Camera(void);
    36   virtual ~Camera(void);
     35  Camera();
     36  virtual ~Camera();
    3737
    3838  void lookAt(PNode* target);
    … …  
    4545  void setViewMode(ViewMode mode);
    4646  void tick(float dt);
    47   void apply (void);
     47  void apply ();
    4848
    4949  void process(const Event &event);
    … …  
    6767
    6868 private:
    69   CameraTarget(void);
     69  CameraTarget();
    7070
    7171 public:
    72   virtual ~CameraTarget(void);
     72  virtual ~CameraTarget();
    7373};
    7474

  • orxonox/trunk/src/world_entities/npc.h

    r3544 r4746  
    2020  float zCor;
    2121
    22   void drawNPC(void);
    23   void paint(void);
     22  void drawNPC();
     23  void paint();
    2424  void setPosition(float x, float y, float z);
    2525  void getPosition(float* x, float* y, float* z);
    2626  void addAI(AI* ai);
    2727  void setCollisionRadius(float r);
    28   float getCollisionRadius(void);
    29   int hit(void);
    30   void die(void);
     28  float getCollisionRadius();
     29  int hit();
     30  void die();
    3131
    3232 private:

  • orxonox/trunk/src/world_entities/player.h

    r4404 r4746  
    6565 
    6666  void move(float time);
    67   void weapon(void);
     67  void weapon();
    6868 
    6969};

  • orxonox/trunk/src/world_entities/skybox.cc

    r4680 r4746  
    6868}
    6969
    70 void SkyBox::preInit(void)
     70void SkyBox::preInit()
    7171{
    7272  this->setClassID(CL_SKYBOX, "SkyBox");
    … …  
    8686}
    8787
    88 void SkyBox::postInit(void)
     88void SkyBox::postInit()
    8989{
    9090  this->rebuild();

  • orxonox/trunk/src/world_entities/skybox.h

    r4680 r4746  
    2626  virtual ~SkyBox();
    2727
    28   void preInit(void);
     28  void preInit();
    2929
    3030  void loadParams(const TiXmlElement* root);
    3131
    32   void postInit(void);
     32  void postInit();
    3333
    3434

  • orxonox/trunk/src/world_entities/terrain.cc

    r4607 r4746  
    7373
    7474*/
    75 Terrain::~Terrain (void)
     75Terrain::~Terrain ()
    7676{
    7777  if (objectList)
    … …  
    8080
    8181
    82 void Terrain::init(void)
     82void Terrain::init()
    8383{
    8484  this->setClassID(CL_TERRAIN, "Terrain");

  • orxonox/trunk/src/world_entities/terrain.h

    r4607 r4746  
    2828  Terrain(const char* fileName);
    2929  Terrain(DebugTerrain debugTerrain);
    30   virtual ~Terrain(void);
     30  virtual ~Terrain();
    3131
    32   void init(void);
     32  void init();
    3333  void loadParams(const TiXmlElement* root);
    3434

  • orxonox/trunk/src/world_entities/test_gun.h

    r3888 r4746  
    4040  virtual ~TestGun ();
    4141
    42   virtual void activate(void);
    43   virtual void deactivate(void);
     42  virtual void activate();
     43  virtual void deactivate();
    4444
    45   virtual void fire(void);
     45  virtual void fire();
    4646  virtual void hit (WorldEntity* weapon, Vector* loc);
    47   virtual void destroy(void);
     47  virtual void destroy();
    4848 
    4949  virtual void tick(float time);
    50   virtual void weaponIdle(void);
    51   virtual void draw(void);
     50  virtual void weaponIdle();
     51  virtual void draw();
    5252
    5353

  • orxonox/trunk/src/world_entities/weapon.h

    r4597 r4746  
    109109  virtual ~Weapon ();
    110110
    111   void enable(void);
    112   void disable(void);
    113   bool isEnabled(void);
     111  void enable();
     112  void disable();
     113  bool isEnabled();
    114114
    115115  void setProjectile(Projectile* projectile);
    116   Projectile* getProjectile(void);
     116  Projectile* getProjectile();
    117117
    118   virtual void activate(void);
    119   virtual void deactivate(void);
    120   bool isActive(void);
     118  virtual void activate();
     119  virtual void deactivate();
     120  bool isActive();
    121121
    122122
    … …  
    136136     shoot again
    137137  */
    138   inline float getWeaponIdleTime(void) const { return this->idleTime;}
     138  inline float getWeaponIdleTime() const { return this->idleTime;}
    139139  /**
    140140     \brief checks if the idle time is elapsed
    … …  
    144144   shoot again
    145145  */
    146   inline bool hasWeaponIdleTimeElapsed(void) const { return (this->localTime>this->idleTime)?true:false; }
     146  inline bool hasWeaponIdleTimeElapsed() const { return (this->localTime>this->idleTime)?true:false; }
    147147
    148148  /**
    … …  
    151151     this is called from the player.cc, when fire-button is been pushed
    152152  */
    153   virtual void fire(void) = 0;
     153  virtual void fire() = 0;
    154154  virtual void hit (WorldEntity* weapon, Vector* loc);
    155   virtual void destroy(void);
     155  virtual void destroy();
    156156
    157157  virtual void tick(float time);
    158   virtual void weaponIdle(void);
    159   virtual void draw(void);
     158  virtual void weaponIdle();
     159  virtual void draw();
    160160
    161161 protected:

  • orxonox/trunk/src/world_entities/world_entity.h

    r4689 r4746  
    5151
    5252  /** \returns the Count of Faces on this WorldEntity */
    53   virtual unsigned int getFaceCount (void) const { if (this->model) return this->model->getFaceCount(); else return 0; };
     53  virtual unsigned int getFaceCount () const { if (this->model) return this->model->getFaceCount(); else return 0; };
    5454
    5555  void processDraw ();
Note: See TracChangeset for help on using the changeset viewer.