Changeset 10671 in orxonox.OLD

Timestamp:

Jun 5, 2007, 5:52:48 PM (17 years ago)

Author:

nicolasc

Message:

some bugfix (or not?)

Location:

branches/vs-enhencements/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (8 diffs)
• space_ships/space_ship.h (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

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

@@ -21 +21 @@
 
 #include "util/loading/resource_manager.h"
+
+#include "world_entities/weapons/weapon_manager.h"
 
 #include "weapons/test_gun.h"
@@ -64 +66 @@
 #include "tools/cameraman.h"
 
+#include "tools/mount_point.h"
+#include "weapons/weapon_slot.h"
 
 #include "util/loading/load_param.h"
@@ -161 +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(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);
@@ -171 +175 @@
 
 
-  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
-  this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
-  this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
-  this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
+//   this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
 
   this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
@@ -211 +215 @@
   setEngine(15);
 
+  this->bInit = false;
 
 //   loadEnergyShare(.3,.3,.4);
@@ -290 +295 @@
 
 
-//   this->toList(OM_GROUP_00);
-
-  if ( this->hasPlayer() ){
-    State::getPlayer()->hud().setShieldWidget(this->getShieldWidget());
-    State::getPlayer()->hud().setEnergyWidget(this->getElectronicWidget());
-  }
+  this->toList(OM_GROUP_00);
+
+//   if ( this->hasPlayer() ){
+//     State::getPlayer()->hud().setShieldWidget(this->getShieldWidget());
+//     State::getPlayer()->hud().setEnergyWidget(this->getElectronicWidget());
+//   }
 }
 
@@ -439 +444 @@
 void SpaceShip::tick (float time)
 {
+/*
+  if( !this->bInit)
+  {
+    // now get slots from the mount points
+    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();
+      }
+    }
+  this->bInit = true;
+  }*/
+
   // Playable::tick(time);
 
@@ -667 +693 @@
   static float tmp = this->decreaseShield(pDamage);
   if( tmp > 0)
-  if ( this->decreaseHealth(tmp / 2) )
+  if ( this->decreaseHealth(tmp / 2) > 0)
     this->destroy(this);
 

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

@@ -156 +156 @@
     int         curWeaponSecondary; //!< current secondary weapon config
 
-    bool                  bForward;                //!< up button pressed.
-    bool                  bBackward;              //!< down button pressed.
+    bool                  bForward;           //!< up button pressed.
+    bool                  bBackward;          //!< down button pressed.
     bool                  bLeft;              //!< left button pressed.
     bool                  bRight;             //!< right button pressed.
@@ -165 +165 @@
     bool                  bRollR;             //!< rolling button pressed (right)
     bool                  bSecFire;           //!< second fire button pressed
+
+    bool                  bInit;              //!< set true, if MP have been loaded
 
     /*

branches/vs-enhencements/src/world_entities/world_entity.h

@@ -190 +190 @@
   void loadElectronic(float cur, float max, float th, float regen)
       { this->setElectronic(cur); this->setElectronicMax(max); this->setElectronicTH(th); this->setElectronicRegen(regen); };
-/*
-  OrxGui::GLGuiEnergyWidgetVertical* getHealthWidget() { return this->healthWidget; };
-  OrxGui::GLGuiEnergyWidgetVertical* getShieldWidget() { return this->shieldWidget; };
-  OrxGui::GLGuiEnergyWidgetVertical* getEnergyWidget() { return this->electronicWidget; };*/
 
 
   virtual void varChangeHandler( std::list<int> & id );
-
-