Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5847 in orxonox.OLD


Ignore:
Timestamp:
Dec 1, 2005, 4:38:39 PM (19 years ago)
Author:
snellen
Message:

player.cc and player.h updated (both files in ../src/world_entities)

Location:
branches/spaceshipcontrol/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/world_entities/playable.h

    r5838 r5847  
    1010#include "event.h"
    1111
     12class Weapon;
    1213class WeaponManager;
    1314
     
    2829    void loadParams(const TiXmlElement* root);
    2930
    30     void addWeapon(Weapon* weapon);
    31     void removeWeapon(Weapon* weapon);
     31    virtual void addWeapon(Weapon* weapon )= 0;
     32    virtual void removeWeapon(Weapon* weapon) = 0;
    3233
    33     virtual void process(const Event &event);
     34    virtual void process(const Event &event) = 0;
    3435
    3536    WeaponManager* getWeaponManager();
  • branches/spaceshipcontrol/src/world_entities/player.cc

    r5841 r5847  
    6868}
    6969
     70/**
     71 * subscribe to all events because the player dosen't know to witch keys the controllable can react
     72 */
    7073void Player::subscribeEvents()
    7174{
     
    7881}
    7982
     83
    8084void Player::setControllable(Playable controllalble)
    8185 {
    8286   this->controllable = controllable;
    8387 }
     88
    8489
    8590
  • branches/spaceshipcontrol/src/world_entities/player.h

    r5840 r5847  
    3131    virtual void  process(const Event &event);
    3232
    33     void          setControllable(Playable controllalble);
     33    void          setControllable(Playable* controllalble);
    3434    Playable*     getControllable();
    3535
Note: See TracChangeset for help on using the changeset viewer.