Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5894 in orxonox.OLD for branches


Ignore:
Timestamp:
Dec 3, 2005, 4:47:34 PM (19 years ago)
Author:
bensch
Message:

controll: better controll

Location:
branches/spaceshipcontrol/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/story_entities/world.cc

    r5892 r5894  
    214214
    215215  AnimationPlayer::getInstance(); // initializes the animationPlayer
     216  ParticleEngine::getInstance();
    216217  PhysicsEngine::getInstance();
    217218
     
    345346    LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
    346347
    347 //   LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
     348   LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
    348349//   LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
    349350
  • branches/spaceshipcontrol/src/world_entities/power_ups/laser_power_up.cc

    r5750 r5894  
    7979{
    8080 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
    81  if (entity->isA(CL_PLAYER))
     81 if (entity->isA(CL_PLAYABLE))
    8282  State::getWorldEntityList()->remove(this);
    8383}
  • branches/spaceshipcontrol/src/world_entities/power_ups/turret_power_up.cc

    r5750 r5894  
    7979{
    8080 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
    81  if (entity->isA(CL_PLAYER))
     81 if (entity->isA(CL_PLAYABLE))
    8282  State::getWorldEntityList()->remove(this);
    8383}
  • branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

    r5893 r5894  
    108108
    109109  PRINTF(4)("SPACESHIP INIT\n");
    110   travelSpeed = 15.0;
     110  travelSpeed = 100.0;
    111111  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
    112112  bFire = false;
    113   acceleration = 10.0;
     113  acceleration = 50.0;
    114114
    115115//   GLGuiButton* button = new GLGuiPushButton();
     
    127127  registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
    128128  registerEvent(SDLK_PAGEUP);
    129   registerEvent( SDLK_PAGEDOWN);
     129  registerEvent(SDLK_PAGEDOWN);
    130130
    131131  this->getWeaponManager()->setSlotCount(7);
     
    276276  //orthDirection = orthDirection.cross (direction);
    277277
    278   if( this->bUp && this->getRelCoor().x < 20)
     278  if( this->bUp)
    279279    accel += direction;
    280   if( this->bDown && this->getRelCoor().x > -5)
     280  if( this->bDown)
    281281    accel -= direction;
    282282
Note: See TracChangeset for help on using the changeset viewer.