Changeset 5894 in orxonox.OLD

Timestamp:

Dec 3, 2005, 4:47:34 PM (18 years ago)

Author:

bensch

Message:

controll: better controll

Location:

branches/spaceshipcontrol/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (3 diffs)

branches/spaceshipcontrol/src/story_entities/world.cc

@@ -214 +214 @@
 
   AnimationPlayer::getInstance(); // initializes the animationPlayer
+  ParticleEngine::getInstance();
   PhysicsEngine::getInstance();
 
@@ -345 +346 @@
     LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
 
-//   LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
+   LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
 //   LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 

branches/spaceshipcontrol/src/world_entities/power_ups/laser_power_up.cc

@@ -79 +79 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYER))
+ if (entity->isA(CL_PLAYABLE))
   State::getWorldEntityList()->remove(this);
 }

branches/spaceshipcontrol/src/world_entities/power_ups/turret_power_up.cc

@@ -79 +79 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYER))
+ if (entity->isA(CL_PLAYABLE))
   State::getWorldEntityList()->remove(this);
 }

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -108 +108 @@
 
   PRINTF(4)("SPACESHIP INIT\n");
-  travelSpeed = 15.0;
+  travelSpeed = 100.0;
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
-  acceleration = 10.0;
+  acceleration = 50.0;
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -127 +127 @@
   registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
   registerEvent(SDLK_PAGEUP);
-  registerEvent( SDLK_PAGEDOWN);
+  registerEvent(SDLK_PAGEDOWN);
 
   this->getWeaponManager()->setSlotCount(7);
@@ -276 +276 @@
   //orthDirection = orthDirection.cross (direction);
 
-  if( this->bUp && this->getRelCoor().x < 20)
+  if( this->bUp)
     accel += direction;
-  if( this->bDown && this->getRelCoor().x > -5)
+  if( this->bDown)
     accel -= direction;