Changeset 10117 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Dec 20, 2006, 12:31:27 AM (18 years ago)

Author:

marcscha

Message:

Last update, collision working again. SEGFAULT problems

Location:

branches/playability/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (7 diffs)
• space_ship.h (modified) (1 diff)

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

@@ -147 +147 @@
   Weapon* wpRight1 = new LightBlaster ();
   wpRight1->setName( "LightBlaster");
-  wpRight1->setParent( this);
+  //wpRight1->setParent( this);
   Weapon* wpLeft1 = new LightBlaster ();
   wpLeft1->setName( "LightBlaster");
-  wpLeft1->setParent( this);
+  //wpLeft1->setParent( this);
 
   Weapon* wpRight2 = new MediumBlaster ();
   wpRight2->setName( "MediumBlaster");
-  wpRight2->setParent( this);
+  //wpRight2->setParent( this);
   Weapon* wpLeft2 = new MediumBlaster ();
   wpLeft2->setName( "MediumBlaster");
-  wpLeft2->setParent( this);
+  //wpLeft2->setParent( this);
   
   Weapon* wpRight3 = new HeavyBlaster ();
   wpRight3->setName( "HeavyBlaster");
-  wpRight3->setParent( this);
+  //wpRight3->setParent( this);
   Weapon* wpLeft3 = new HeavyBlaster ();
   wpLeft3->setName( "HeavyBlaster");
-  wpLeft3->setParent( this);
+  //wpLeft3->setParent( this);
 
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-  cannon->setParent( this);
+  //cannon->setParent( this);
 
 
@@ -180 +180 @@
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
-
+/*
   wpRight1->requestAction(WA_ACTIVATE);
   wpLeft1->requestAction(WA_ACTIVATE);
@@ -190 +190 @@
 
   cannon->requestAction(WA_ACTIVATE);
-
+*/
   
   this->weaponMan.changeWeaponConfig(1);
@@ -418 +418 @@
 void SpaceShip::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("SPACESHIP COLLIDED WITH %s\n",entity->getCName());
 }
 
@@ -669 +668 @@
 
 void SpaceShip::damage(float pDamage, float eDamage){
-  PRINTF(0)("ship hit for (%f,%f) \n",pDamage,eDamage);
+  PRINTF(5)("ship hit for (%f,%f) \n",pDamage,eDamage);
 
   if( this->shieldActive) {
@@ -968 +967 @@
 void SpaceShip::nextWeaponConfig()
 {
-  
-  this->curWeaponPrimary    = (curWeaponPrimary + 1) % 3;
-  this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  PRINTF(0)("Requested next weapon config!\n");
+  this->weaponMan.nextWeaponConfig();
   Playable::weaponConfigChanged();
 }
@@ -979 +977 @@
 void SpaceShip::previousWeaponConfig()
 {
-  this->curWeaponPrimary    = (curWeaponPrimary + 1) % 3;
+  this->curWeaponPrimary    = (this->curWeaponPrimary + 1) % 3;
   this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
   Playable::weaponConfigChanged();
 }
+
+void SpaceShip::hit(float damage, WorldEntity* killer)
+{
+  this->damage(killer->getDamage(),0);
+  killer->collidesWith( this, this->getAbsCoor());
+  //this->collidesWith(killer, this->getAbsCoor());
+}

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -82 +82 @@
     void previousWeaponConfig();
 
-    inline void hit(float damage, WorldEntity* killer) { this->collidesWith(killer, this->getAbsCoor()); killer->collidesWith(this, this->getAbsCoor()); } ;
+    virtual void hit(float damage, WorldEntity* killer);
 
   private: