- Timestamp:
- Sep 11, 2010, 10:20:44 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/notifications (added) merged: 7319,7324,7326,7338-7343,7348-7349,7351,7354-7355,7358-7360,7362,7395,7398-7400
- Property svn:mergeinfo changed
-
code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h
r7301 r7403 38 38 39 39 #include "core/BaseObject.h" 40 #include "interfaces/PlayerTrigger.h" 40 41 41 42 namespace orxonox … … 48 49 Damian 'Mozork' Frick 49 50 */ 50 class _ObjectsExport MultiTriggerContainer : public BaseObject 51 class _ObjectsExport MultiTriggerContainer : public BaseObject, public PlayerTrigger 51 52 { 52 53 … … 72 73 MultiTrigger* originator_; //!< The originator. 73 74 BaseObject* data_; //!< The data. 75 74 76 }; 75 77
Note: See TracChangeset
for help on using the changeset viewer.