Changeset 10526 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2007, 11:37:43 PM (18 years ago)

Author:

patrick

Message:

probably the parenting fix

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/mount_point.cc

@@ -42 +42 @@
 
   this->_name = name;
-  this->setAbsCoor( center);
-  this->setAbsDir( Quaternion(forward, up));
+  this->setRelCoor( center);
+  this->setRelDir( Quaternion(forward, up));
 
   this->init();

trunk/src/world_entities/space_ships/space_ship.cc

@@ -616 +616 @@
   {
     this->bRight = event.bPressed;
-    printf("ShipCoors: %f , %f, %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
   }
   else if( event.type == KeyMapper::PEV_FORWARD)
   {
     this->bForward = event.bPressed; //this->shiftCoor(0,.1,0);
-
   }
   else if( event.type == KeyMapper::PEV_BACKWARD)
@@ -1155 +1153 @@
      CameraMan* cm = State::getCameraman();
      Camera* c = cm->getCurrentCam();
-     
-     
+
+
   float x = 1.25 * this->actionWidthPercentage * fabsf(c->getAbsCoor().y) * tan(c->getFovy()*M_PI /360.0);
   float y = x / c->getAspectRatio() / this->actionWidthPercentage;

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -434 +434 @@
 void WeaponManager::fire()
 {
-//   printf("firing WM: ");
   Weapon* firingWeapon;
   for(int i = 0; i < this->slotCount; i++)
   {
 //     printf("%i ", i);
-          firingWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
-      if( firingWeapon != NULL && firingWeapon->getCurrentState() == WS_SHOOTING) continue;
-          if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
+    firingWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
+    if( firingWeapon != NULL)
+    {
+      PRINTF(0)("!=NULL\n");
+      if( firingWeapon->getCurrentState() == WS_SHOOTING) continue;
+      PRINTF(0)("FIRE\n");
+
+      firingWeapon->requestAction(WA_SHOOT);
+    }
   }
 //   printf("\n");