Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5853 in orxonox.OLD


Ignore:
Timestamp:
Dec 1, 2005, 5:51:59 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:
2 edited

Legend:

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

    r5847 r5853  
    99#include "world_entity.h"
    1010#include "event.h"
     11#include <list.h>
    1112
    1213class Weapon;
     
    3334
    3435    virtual void process(const Event &event) = 0;
    35 
     36    virtual void setKeySet();
     37    virtual void getKeySet();
    3638    WeaponManager* getWeaponManager();
    3739
     
    3941
    4042    WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
     43    std::list<Event*>      events;
     44
    4145
    4246};
  • branches/spaceshipcontrol/src/world_entities/player.cc

    r5852 r5853  
    5757
    5858/**
    59  * subscribe to all events because the player dosen't know to witch keys the controllable can react
     59 * subscribe to all events the controllable needs
    6060 */
    6161void Player::subscribeEvents()
    6262{
    63   EventHandler* evh = EventHandler::getInstance();
     63  /*EventHandler* evh = EventHandler::getInstance();
    6464  for (int i = 1; i < SDLK_LAST; i++)
    6565   {
     
    6767          evh->subscribe(this, ES_GAME, i);
    6868   }
    69 
     69  */
    7070}
    7171
     
    7878void Player::setControllable(Playable* controllalble)
    7979 {
     80   //todo get keyset an subscribe to the needed keys
    8081   this->controllable = controllable;
    8182 }
Note: See TracChangeset for help on using the changeset viewer.