Changeset 10687 in orxonox.OLD

Timestamp:

Jun 12, 2007, 5:59:36 PM (17 years ago)

Author:

nicolasc

Message:

xfer

Location:

branches/vs-enhencements/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (7 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• weapons/weapon_slot.h (modified) (1 diff)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -165 +165 @@
   this->secWeaponMan.setSlotCount(6);
 
-//   this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-//   this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
 
@@ -211 +211 @@
   Playable::weaponConfigChanged();
 
-  this->bInit = false;
+//   this->bInit = false;
 
   loadEnergyShare(.3,.3,.4);
@@ -297 +297 @@
 
 
-  dynamic_cast<WorldEntity*>(this)->createHealthWidget();
-  dynamic_cast<WorldEntity*>(this)->createShieldWidget();
-  dynamic_cast<WorldEntity*>(this)->createElectronicWidget();
+  (this)->createHealthWidget();
+  (this)->createShieldWidget();
+  (this)->createElectronicWidget();
 
   if ( this->hasPlayer() ){
@@ -399 +399 @@
 void SpaceShip::postSpawn ()
 {
+//   std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin();
+//   for( ;it != this->mountPointMap.end(); it++)
+//   {
+//     WeaponSlot* ws = dynamic_cast<WeaponSlot*>((*it).second->getMount());
+//     if( ws != NULL && ws->isA(WeaponSlot::staticClassID()))
+//     {
+//       int slot = ws->getWeaponSlot();
+// //        int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
+//       this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
+//     this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
+// //         PRINTF(0)("setting slot %i\n", slot);
+// //         (*it).second->getCenter().debug();
+//     }
+//   }
+
   if(this->hasPlayer())
     Playable::postSpawn();
@@ -445 +460 @@
 }
 
+
+
+
+
 /**
  *  the function called for each passing timeSnap
@@ -451 +470 @@
 void SpaceShip::tick (float time)
 {
-
+/*
   if( !this->bInit)
   {
@@ -470 +489 @@
     }
   this->bInit = true;
-  }
+  }*/
 
   // Playable::tick(time);

branches/vs-enhencements/src/world_entities/space_ships/space_ship.h

@@ -166 +166 @@
     bool                  bSecFire;           //!< second fire button pressed
 
-    bool                  bInit;              //!< set true, if MP have been loaded
+//    bool                  bInit;              //!< set true, if MP have been loaded
 
     /*

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h

@@ -9 +9 @@
 #include "p_node.h"
 #include "weapon.h"
-#include "weapon_manager.h"
+// #include "weapon_manager.h"
+
+#define    WM_MAX_CONFIGS          4              //!< The maximum number of predefined Configurations
 
 class Weapon;