Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5899 in orxonox.OLD for branches/spaceshipcontrol/src


Ignore:
Timestamp:
Dec 3, 2005, 5:43:42 PM (19 years ago)
Author:
bensch
Message:

controll: better player

Location:
branches/spaceshipcontrol/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/story_entities/world.cc

    r5895 r5899  
    6969#include "npcs/npc_test1.h"
    7070#include "shader.h"
     71
     72#include "playable.h"
    7173
    7274SHELL_COMMAND(speed, World, setSpeed);
  • branches/spaceshipcontrol/src/world_entities/player.cc

    r5895 r5899  
    1515
    1616#include "player.h"
     17#include "playable.h"
    1718
    1819#include "event_handler.h"
    19 #include "event.h"
    2020
    2121using namespace std;
  • branches/spaceshipcontrol/src/world_entities/player.h

    r5895 r5899  
    77#define _PLAYER_H
    88
    9 #include "world_entity.h"
    10 #include "physics_interface.h"
    119#include "event_listener.h"
    12 #include "playable.h"
    1310
     11/* Forward Declaration */
     12class Playable;
    1413
    1514//! Basic controllable WorldEntity
     
    2625    virtual ~Player();
    2726
    28     void          init();
     27    bool              setControllable(Playable* controllalble);
     28    void              disconnectControllable();
     29    inline Playable*  getControllable() { return this->controllable; };
    2930
     31    // eventListener extension.
     32    virtual void      process(const Event &event);
    3033
    31     virtual void  process(const Event &event);
    32 
    33     bool          setControllable(Playable* controllalble);
    34     void          disconnectControllable();
    35     Playable*     getControllable() { return this->controllable; };
     34  private:
     35    void              init();
    3636
    3737
    3838  private:
    39     Playable*          controllable;
    40 
    41 
     39    Playable*         controllable;                  //!< The one we controll or NULL if none
    4240};
    4341
Note: See TracChangeset for help on using the changeset viewer.