Context Navigation

modules

Timestamp:

May 12, 2011, 1:51:18 PM (15 years ago)

Author:

FelixSchulthess

Message:

merged portals branch into trunk

Location:

code/trunk

Files:

code/trunk
- Property svn:mergeinfo changed
  /code/branches/portals (added) merged: 8177,8198-8200,8243,8278,8290,8454-8455

r7401	r8457
32	32	ADD_SUBDIRECTORY(pickup)
33	33	ADD_SUBDIRECTORY(pong)
	34	ADD_SUBDIRECTORY(portals)
34	35	ADD_SUBDIRECTORY(questsystem)
35	36	ADD_SUBDIRECTORY(weapons)

-                      r8213
+                      r8457
             inline bool isTarget(BaseObject* target)
                 { if(target == NULL) return true; else return targetMask_.isIncluded(target->getIdentifier()); }
+            void addTarget(const std::string& targets); //!< Add some target to the MultiTrigger.
         protected:
 …
             void broadcast(bool status); //!< Helper method. Broadcasts an Event for every object that is a target.
+            void addTarget(const std::string& targets); //!< Add some target to the MultiTrigger.
+            void removeTarget(const std::string& targets); //!< Remove some target from the MultiTrigger.
+            void removeTarget(const std::string& target); //!< Remove some target from the MultiTrigger.
             /**

r8455	r8457
33	33	XMLPortParam(PortalEndPoint, "design", setTemplate, getTemplate, xmlelement, mode);
34	34	XMLPortParamExtern(PortalEndPoint, DistanceMultiTrigger, this->trigger_, "distance", setDistance, getDistance, xmlelement, mode);
35		XMLPortParamLoadOnly(PortalEndPoint, "target", setTargets, xmlelement, mode).defaultValues("Pawn");
	35	XMLPortParamLoadOnly(PortalEndPoint, "target", setTarget, xmlelement, mode).defaultValues("Pawn");
36	36
37	37	// Add the DistanceMultiTrigger as event source.

r8455	r8457
21	21	virtual ~PortalEndPoint();
22	22	virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
23		inline void setTarget~~s(const std::string & targets~~) //!< add types which are allowed to activate the PortalEndPoint
	23	inline void setTarget(const std::string & target) //!< add types which are allowed to activate the PortalEndPoint
24	24	{
25		this->trigger_->addTarget~~s(targets~~);
	25	this->trigger_->addTarget(target);
26	26	}
27	27

Note: See TracChangeset for help on using the changeset viewer.