Changeset 4404 in orxonox.OLD

Timestamp:

May 30, 2005, 6:27:45 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: player now is a EventListener for particular events

Location:

orxonox/trunk/src

Files:

• util/event/event.h (modified) (1 diff)
• util/event/event_listener.h (modified) (1 diff)
• world_entities/player.cc (modified) (5 diffs)
• world_entities/player.h (modified) (3 diffs)

orxonox/trunk/src/util/event/event.h

@@ -15 +15 @@
 
 //! An abstract event class
-class Event : public BaseObject {
+class Event : virtual public BaseObject {
 
  public:

orxonox/trunk/src/util/event/event_listener.h

@@ -14 +14 @@
 
 //! A class for event listener
-class EventListener : public BaseObject {
+class EventListener : virtual public BaseObject {
 
  public:

orxonox/trunk/src/world_entities/player.cc

@@ -28 +28 @@
 #include "stdincl.h"
 
+#include "event_handler.h"
 
 #include "projectile.h"
+#include "event.h"
 
 using namespace std;
@@ -65 +67 @@
 }
 
+
 /**
    \brief destructs the player, deletes alocated memory
@@ -76 +79 @@
   delete this->weaponMan;
 }
+
 
 /**
@@ -110 +114 @@
 }
 
+
 /**
    \brief adds a weapon to the weapon list of player
@@ -275 +280 @@
   if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_NEXT_WEAPON)) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
 }
+
+
+void Player::process(const Event &event)
+{
+
+}

orxonox/trunk/src/world_entities/player.h

@@ -9 +9 @@
 #include "world_entity.h"
 #include "physics_interface.h"
+#include "event_listener.h"
 
 template<class T> class tList;
@@ -15 +16 @@
 class Vector;
 class World;
+class Event;
 
 //! Basic controllable WorldEntity
-class Player : public WorldEntity, public PhysicsInterface
+class Player : public WorldEntity, public PhysicsInterface, public EventListener
 {
   friend class World;
@@ -38 +40 @@
 
   virtual void command(Command* cmd);
+
+  virtual void process(const Event &event);
   
  private: