Changeset 9629 for code/branches/core6/src/modules/portals
- Timestamp:
- Aug 9, 2013, 9:26:46 PM (11 years ago)
- Location:
- code/branches/core6/src/modules/portals
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/src/modules/portals/PortalEndPoint.cc
r9526 r9629 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_); -
code/branches/core6/src/modules/portals/PortalEndPoint.h
r9526 r9629 60 60 { 61 61 public: 62 PortalEndPoint( BaseObject* creator);62 PortalEndPoint(Context* context); 63 63 virtual ~PortalEndPoint(); 64 64 -
code/branches/core6/src/modules/portals/PortalLink.cc
r8767 r9629 40 40 std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s; 41 41 42 PortalLink::PortalLink( BaseObject* creator) : BaseObject(creator), fromID_(0), toID_(0), from_(0), to_(0)42 PortalLink::PortalLink(Context* context) : BaseObject(context), fromID_(0), toID_(0), from_(0), to_(0) 43 43 { 44 44 RegisterObject(PortalLink); -
code/branches/core6/src/modules/portals/PortalLink.h
r8767 r9629 54 54 { 55 55 public: 56 PortalLink( BaseObject* creator);56 PortalLink(Context* context); 57 57 virtual ~PortalLink(); 58 58 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
Note: See TracChangeset
for help on using the changeset viewer.