Changeset 6679 in orxonox.OLD

Timestamp:

Jan 24, 2006, 10:56:46 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: WeaponManager seems to work, better than before.

Location:

trunk/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (4 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (2 diffs)
• world_entities/weapons/weapon_manager.h (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+    ;// SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -110 +110 @@
   this->addWeapon(wpRight,1 ,1);
   this->addWeapon(cannon, 0, 6);
-
-  //this->addWeapon(turret, 3, 0);
 
   this->getWeaponManager()->changeWeaponConfig(1);
@@ -291 +289 @@
     if (yMouse > controlVelocityY) yMouse = controlVelocityY;
     else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
-    
+
     pitchDir = (Quaternion(xMouse*mouseSensitivity*0.5, Vector(1,0,0)));
-    
+
     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity*yInvert, Vector(0,0,1))*pitchDir);
     xMouse = yMouse = 0;
@@ -306 +304 @@
 
   Vector move = velocity*time;
-  
+
   //orient the velocity in the direction of the spaceship.
   travelSpeed = velocity.len();
@@ -321 +319 @@
   if(travelSpeed >= 120) velocity -= velocity.getNormalized()*travelSpeed*travelSpeed*0.0001;
   else if (travelSpeed <= 80) velocity -= velocity.getNormalized()*travelSpeed*0.001;
-  
+
   //other physics (gravity)
   if(travelSpeed < 120)
   move += Vector(0,-1,0)*60*time + Vector(0,1,0)*travelSpeed/2*time;
-   
+
   //hoover effect
   //cycle += time;

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -203 +203 @@
 }
 
-
-bool WeaponManager::addWeapon(Weapon* weapon)
-{
-  int weaponConf = this->currentConfigID;
-  int slot = this->getNextFreeSlot(weaponConf, weapon->getCapability());
-  if (slot  != -1 )
-  {
-    return this->addWeapon(weapon, weaponConf, slot);
-  }
-  else
-  {
-    return this->addWeapon(weapon, -1, -1);
-  }
-}
 
 /**
@@ -231 +217 @@
 bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
+  assert(weapon != NULL);
+
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))
   {
-    PRINTF(2)("Slot %d of config %d is not availiabe (max: %d)\n", slotID, configID, this->slotCount);
-    return false;
+    PRINTF(2)("Slot %d of config %d is not availiabe (max: %d) searching for suitable slot\n", slotID, configID, this->slotCount);
+    if (configID >= WM_MAX_CONFIGS)
+      configID = -1;
+    if (slotID >= (int)this->slotCount)
+      slotID = -1;
+  }
+  // if no ConfigID is supplied set to Current Config.
+  if (configID <= -1)
+    configID = this->currentConfigID;
+  //
+  if (configID > -1 && slotID == -1)
+  {
+    slotID = this->getNextFreeSlot(configID, weapon->getCapability());
+    if (slotID == -1)
+      configID = -1;
   }
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -74 +74 @@
     PNode* getParent() const { return this->parent; };
 
-    bool addWeapon(Weapon* weapon);
-    bool addWeapon(Weapon* weapon, int configID, int slotID = -1);
+    bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);