Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6243 in orxonox.OLD for trunk/src/world_entities/space_ships


Ignore:
Timestamp:
Dec 21, 2005, 3:41:11 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the power-ups to the tunk again

Location:
trunk/src/world_entities/space_ships
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/space_ships/space_ship.cc

    r6241 r6243  
    3131#include "key_mapper.h"
    3232#include "event_handler.h"
     33
     34#include "power_ups/weapon_power_up.h"
     35#include "power_ups/param_power_up.h"
    3336
    3437#include "graphics_engine.h"
     
    432435  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
    433436    this->getWeaponManager()->previousWeaponConfig();
    434 
    435437  else if( event.type == SDLK_w)
    436438    this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);
     
    445447     //this->setAbsDir(mouseDir);
    446448  }
     449}
     450
     451/**
     452 *
     453 */
     454bool SpaceShip::pickup(PowerUp* powerUp)
     455{
     456  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
     457    Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
     458    WeaponManager* manager = this->getWeaponManager();
     459    int slot = manager->getNextFreeSlot(0, weapon->getCapability());
     460    if(slot >= 0) {
     461      manager->addWeapon(weapon, 0, slot);
     462      return true;
     463    }
     464  }
     465  else if(powerUp->isA(CL_PARAM_POWER_UP)) {
     466    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
     467    switch(ppu->getType()) {
     468      case PARAM_SHIELD:
     469        break;
     470    }
     471  }
     472  return false;
    447473}
    448474
  • trunk/src/world_entities/space_ships/space_ship.h

    r6222 r6243  
    88
    99#include "playable.h"
     10#include "extendable.h"
    1011
    1112
     
    1415class Event;
    1516
    16 class SpaceShip : public Playable
     17class SpaceShip : public Playable, public Extendable
    1718{
    1819
     
    4142
    4243    virtual void process(const Event &event);
    43 
     44    bool pickup(PowerUp* powerUp);
    4445
    4546
Note: See TracChangeset for help on using the changeset viewer.