Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 11, 2010, 12:34:00 AM (14 years ago)
Author:
landauf
Message:

merged doc branch back to trunk

Location:
code/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/modules/pickup/DroppedPickup.cc

    r7163 r7401  
    6161    @param pickup
    6262        The Pickupable that was dropped.
    63     @param position
    64         The position at which the DroppedPickup should be created.
     63    @param carrier
     64        The PickupCarrier that carried the input pickup before it was dropped.
    6565    @param triggerDistance
    6666        The distance at which the PickupSpawner triggers. Default is 10.

  • code/trunk/src/modules/pickup/Pickup.cc

    r7208 r7401  
    225225        This method must be implemented by any class directly inheriting from Pickupable. It is most easily done by just creating a new DroppedPickup, e.g.:
    226226        DroppedPickup(BaseObject* creator, Pickupable* pickup, const Vector3& position);
    227     @param position
    228         The position at which the PickupSpawner should be placed.
    229227    @return
    230228        Returns true if a spawner was created, false if not.

  • code/trunk/src/modules/pickup/PickupCollection.cc

    r7163 r7401  
    228228    @brief
    229229        Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
    230     @param identifier
    231         A pointer to the PickupIdentifier of the PickupCarrier we want to know of, whether it is a target of this PickupCollection.
     230    @param carrier
     231        A pointer to the PickupCarrier we want to know of, whether it is a target of this PickupCollection.
    232232    @return
    233233        Returns true if the PickupCarrier identified by the input PickupIdentififer it is a target of this PickupCollection, false if not.
    … …  
    336336        This method must be implemented by any class directly inheriting from Pickupable. It is most easily done by just creating a new DroppedPickup, e.g.:
    337337        DroppedPickup(BaseObject* creator, Pickupable* pickup, const Vector3& position);
    338     @param position
    339         The position at which the PickupSpawner should be placed.
    340338    @return
    341339        Returns true if a spawner was created, false if not.

  • code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc

    r7163 r7401  
    9999    @brief
    100100        Add a Pickupable to the PickupCollectionIdentifier.
    101     @param
     101    @param identifier
    102102        A pointer to the PickupIdentifier of the Pickupable to be added.
    103103    */

  • code/trunk/src/modules/pickup/PickupSpawner.cc

    r7163 r7401  
    7070    @param respawnTime
    7171        The minimum time between two spawns.
    72     @param maySpawnedItems
     72    @param maxSpawnedItems
    7373        The maximum number of items spawned by this PickupSpawner.
    7474    */

  • code/trunk/src/modules/pickup/items/SpeedPickup.cc

    r7208 r7401  
    252252    @brief
    253253        Sets the SpeedMultiply
    254     @param speedAdd
     254    @param speedMultiply
    255255        The multiplied Speed
    256256    */
Note: See TracChangeset for help on using the changeset viewer.