Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8457


Ignore:
Timestamp:
May 12, 2011, 1:51:18 PM (14 years ago)
Author:
FelixSchulthess
Message:

merged portals branch into trunk

Location:
code/trunk
Files:
3 edited
9 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/portals.oxw

    r8455 r8457  
    3636
    3737    <PortalEndPoint position="0,0,0" id="1" distance="40" target="MobileEntity" design="PortalDefault"/>
    38     <PortalEndPoint position="-90,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
     38    <PortalEndPoint position="-100,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
    3939    <PortalLink fromID="1" toID="2" />
    4040    <PortalLink fromID="2" toID="1" />
    4141
    42     <PickupSpawner position="-100,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10">
     42    <!--PickupSpawner position="-200,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10">
    4343      <pickup>
    4444        <DronePickup template=dronepickup />
    4545      </pickup>
    46     </PickupSpawner>
     46    </PickupSpawner-->
    4747
    4848    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

  • code/trunk/src/modules/CMakeLists.txt

    r7401 r8457  
    3232ADD_SUBDIRECTORY(pickup)
    3333ADD_SUBDIRECTORY(pong)
     34ADD_SUBDIRECTORY(portals)
    3435ADD_SUBDIRECTORY(questsystem)
    3536ADD_SUBDIRECTORY(weapons)

  • code/trunk/src/modules/objects/triggers/MultiTrigger.h

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

  • code/trunk/src/modules/portals/PortalEndPoint.cc

    r8455 r8457  
    3333        XMLPortParam(PortalEndPoint, "design", setTemplate, getTemplate, xmlelement, mode);
    3434        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");
    3636       
    3737        // Add the DistanceMultiTrigger as event source.

  • code/trunk/src/modules/portals/PortalEndPoint.h

    r8455 r8457  
    2121            virtual ~PortalEndPoint();
    2222            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    23             inline void setTargets(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
    2424            {
    25                 this->trigger_->addTargets(targets);
     25                this->trigger_->addTarget(target);
    2626            }
    2727           
Note: See TracChangeset for help on using the changeset viewer.