Changeset 10684 in orxonox.OLD

Timestamp:

Jun 11, 2007, 11:30:56 AM (17 years ago)

Author:

nicolasc

Message:

some hack, but still does not work

Location:

branches/vs-enhencements/src

Files:

• lib/gui/gl/glgui_box.cc (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/weapons/weapon.cc (modified) (1 diff)
• world_entities/weapons/weapon_slot.h (modified) (1 diff)

branches/vs-enhencements/src/lib/gui/gl/glgui_box.cc

@@ -193 +193 @@
         //float realSizeY = fabsf((*widget)->getSizeX2D() * sinf(radDir)) + fabsf((*widget)->getSizeY2D() * cosf(radDir));
         float realSizeX, realSizeY;
-        int angleAbs = (int)(*widget)->getAbsDir2D();
-        int angleRel = (int)(*widget)->getRelDir2D();
+//         int angleAbs = (int)(*widget)->getAbsDir2D();
+//         int angleRel = (int)(*widget)->getRelDir2D();
         //std::cout << "absangle: " << angleAbs << ", relangle: " << angleRel << '\n';
         if ((*widget)->getAbsDir2D() == 0 || (*widget)->getAbsDir2D() == 180)

branches/vs-enhencements/src/world_entities/npcs/npc.cc

@@ -167 +167 @@
 //   this->getWeaponManager().changeWeaponConfig(1);
 
-  this->setHealthMax(100);
-  this->setHealth(80);
+//   this->setHealthMax(100);
+//   this->setHealth(80);
+  this->loadHealth(80,100);
 
   this->getWeaponManager().setSlotCount(7);

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

@@ -175 +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");
@@ -462 +462 @@
       {
         int slot = ws->getWeaponSlot();
-//         int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
+        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());

branches/vs-enhencements/src/world_entities/weapons/weapon.cc

@@ -145 +145 @@
 
   this->hideInactive = true;                       //< The Weapon will be hidden if it is inactive (by default)
+  this->currentState = WS_INACTIVE;
 
   this->minCharge = 1.0;                           //< The minimum charge the Weapon can hold is 1 unit.

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

@@ -43 +43 @@
   inline void addWeapon(const std::string& weaponName, int config) {this->configs[config] = Weapon::createWeapon(weaponName); }
   inline void setWeapon(Weapon* weapon, int config) {this->configs[config] = weapon; };
-  inline Weapon* getWeapon(int config) { if (config > WM_MAX_CONFIGS) return NULL; return this->configs[config]; };
+  inline Weapon* getWeapon(int config) { if (config > WM_MAX_CONFIGS || config < 0) return NULL; return this->configs[config]; };
 
   inline void setWeaponConfig(int slot, int side) { this->weaponSlot = slot; this->weaponSide = side; }