Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2083


Ignore:
Timestamp:
Nov 1, 2008, 2:38:21 PM (16 years ago)
Author:
landauf
Message:

made some small adjustments in Pickups branch

Location:
code/branches/pickups/src/orxonox/objects/pickup
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.h

    r2000 r2083  
    1111
    1212
    13 namespaces orxonox{
     13namespace orxonox{
    1414
    1515        class _OrxonoxExport ShipEquipment{
     
    2121        private:
    2222                std::multimap<std::string, Item*> Equipment;
     23        };
     24}
    2325
    2426
  • code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h

    r2055 r2083  
    1515                EQClasses["jacke"] = 0;
    1616            Item* item = itemMap_["jacke"];
    17            
     17
    1818           if (itemMap_["jacke"])
    1919           if (itemMap_.find("jacke") != itemMap_.end()) */
    20 namespaces orxonox{
    21        
     20namespace orxonox{
     21
    2222        class _OrxonoxExport ShipEquipment{
    2323        public:
     
    3030                multimap<std::string, ShipItem*> Usable;
    3131                multimap<std::string, ShipItem*> Trunk;
    32        
     32        };
    3333
    3434
  • code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc

    r2055 r2083  
    11#include "Shipitem.h"
    22
     3namespace orxonox
     4{
     5    itemtype ShipItem::CheckType()
     6    {
     7        return this.type;
     8    }
    39
    4 itemtype CheckType(){
    5         return This.type};
    6        
    7 subItemTypePermanent CheckSubType(){
    8         return This.subtype_permanent};
    9        
     10    subItemTypePermanent CheckSubType()
     11    {
     12        return this.subtype_permanent;
     13    }
     14}
  • code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h

    r2055 r2083  
    99
    1010namespace orxonox{
    11 Class _OrxonoxExport ShipItem{
     11class _OrxonoxExport ShipItem{
    1212
    1313        enum itemType{ //Diffrent Types of Items
     
    3030/* Useables are Items the Player can choose when to activate and then show an instant action/effect
    3131 * or for a certain duration */
    32 Class _OrxonoxExport Useable : public ShipItem{
     32class _OrxonoxExport Useable : public ShipItem{
    3333
    3434
     
    5151/* Permanents are Items, that effect the Player or his Ship from the instance he picks them up
    5252   until he drops them again */
    53 Class _OrxonoxExport Permanent : public ShipItem{
     53class _OrxonoxExport Permanent : public ShipItem{
    5454
    5555        enum subItemTypePermanent{ //Diffrent Types of Items of the Type Permanent
     
    6767
    6868// Powerups effect the Player right after he picks them up for a certain Duration /or permanently.
    69 Class _OrxonoxExport Powerups : public ShipItem{
     69class _OrxonoxExport Powerups : public ShipItem{
    7070
    7171        enum subItem TypePowerups{ //Diffrent Types of Items of the Type Powerups
  • code/branches/pickups/src/orxonox/objects/pickup/Usable.h

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/ceguilua/src/orxonox/objects/pickup/Usable1802-1808
      /code/branches/core3/src/orxonox/objects/pickup/Usable1572-1739
      /code/branches/gcc43/src/orxonox/objects/pickup/Usable1580
      /code/branches/gui/src/orxonox/objects/pickup/Usable1635-1723
      /code/branches/input/src/orxonox/objects/pickup/Usable1629-1636
    r2082 r2083  
    33namespace orxonox{
    44        class _OrxonoxExport Usable: public ShipItem{
    5        
     5
    66        public:
    77        subtypeusable CheckSubType();
    88        private:
    99        subtypeusable subtype;
    10                
    11         }
     10
     11        };
     12}
Note: See TracChangeset for help on using the changeset viewer.