Changeset 5855 in orxonox.OLD

Timestamp:

Dec 1, 2005, 5:57:39 PM (18 years ago)

Author:

bensch

Message:

const getEvent and also inline

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• playable.h (modified) (2 diffs)

branches/spaceshipcontrol/src/world_entities/playable.cc

@@ -33 +33 @@
   return weaponMan;
 }
-
-std::list<Event*>* Playable::getEventList()
-{
-  return events;
-}

branches/spaceshipcontrol/src/world_entities/playable.h

@@ -36 +36 @@
     virtual void setKeySet();
     virtual void getKeySet();
-    std::list<Event*> getEventList();
+    inline const std::list<Event*>& getEventList() { return this->events; };
     WeaponManager* getWeaponManager();
 
@@ -42 +42 @@
 
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
-    std::list<Event*>*     events;
+    std::list<Event*>     events;