Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2831


Ignore:
Timestamp:
Mar 23, 2009, 2:39:47 PM (16 years ago)
Author:
danielh
Message:

removed old pickup system

Location:
code/branches/pickups/src/orxonox/objects
Files:
13 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt

    r2710 r2831  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2   PickupSpawner.cc
    3   BaseItem.cc
    4   Turbo.cc
    5   ShipEquipment.cc
     2
    63)

  • code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r2826 r2831  
    3333#include "core/CoreIncludes.h"
    3434#include "core/XMLPort.h"
     35#include "util/Exception.h"
    3536#include "util/Math.h"
    3637#include "PawnManager.h"
    … …  
    6162        this->spawnparticleduration_ = 3.0f;
    6263
    63         this->getPickUp().setPlayer(this);
    64 
    6564        if (Core::isMaster())
    6665        {
    … …  
    267266    void Pawn::dropItems()
    268267    {
    269         pickUp.eraseAll();
     268        ThrowException(NotImplemented, "Pickupsystem not implemented yet.");
    270269    }
    271270

  • code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h

    r2826 r2831  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "objects/pickup/ShipEquipment.h"
    3433#include "objects/worldentities/ControllableEntity.h"
    3534#include "objects/RadarViewable.h"
    … …  
    107106                { return this->numexplosionchunks_; }
    108107
    109             inline ShipEquipment& getPickUp()
    110                 {return this->pickUp;}
    111 
    112108            virtual void dropItems();
    113109
    … …  
    117113            virtual void spawneffect();
    118114
    119             ShipEquipment pickUp;
    120115            bool bAlive_;
    121116
Note: See TracChangeset for help on using the changeset viewer.