Changeset 9667 for code/trunk/src/modules/portals/PortalEndPoint.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/portals/PortalEndPoint.cc
r9526 r9667 42 42 namespace orxonox 43 43 { 44 CreateFactory(PortalEndPoint);44 RegisterClass(PortalEndPoint); 45 45 46 46 /*static*/ const std::string PortalEndPoint::EVENTFUNCTIONNAME = "execute"; … … 48 48 std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s; 49 49 50 PortalEndPoint::PortalEndPoint( BaseObject* creator) : StaticEntity(creator), RadarViewable(creator, static_cast<WorldEntity*>(this)), id_(0), trigger_(NULL), reenterDelay_(0)50 PortalEndPoint::PortalEndPoint(Context* context) : StaticEntity(context), RadarViewable(this, static_cast<WorldEntity*>(this)), id_(0), trigger_(NULL), reenterDelay_(0) 51 51 { 52 52 RegisterObject(PortalEndPoint); 53 53 54 this->trigger_ = new DistanceMultiTrigger(this );54 this->trigger_ = new DistanceMultiTrigger(this->getContext()); 55 55 this->trigger_->setName("portal"); 56 56 this->attach(this->trigger_); … … 61 61 if( GameMode::isMaster() ) 62 62 { 63 this->portalSound_ = new WorldSound(this );63 this->portalSound_ = new WorldSound(this->getContext()); 64 64 this->portalSound_->setLooping(false); 65 65 this->attach(this->portalSound_);
Note: See TracChangeset
for help on using the changeset viewer.