Changeset 9998 in orxonox.OLD for branches/playability/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Dec 3, 2006, 7:40:07 PM (18 years ago)

Author:

marcscha

Message:

multiple weapons, crosshair visibility → changelog

File:

• branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) (4 diffs)

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -103 +103 @@
 
   this->currentConfigID = 0;
-  this->slotCount = 6;
+  this->slotCount = WM_MAX_SLOTS;
   //this->weaponChange;
 
@@ -114 +114 @@
   this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
   this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
+
+  this->hideCrosshair();
+}
+
+void WeaponManager::showCrosshair()
+{
+  this->crosshair->setVisibility( true);
+}
+
+void WeaponManager::hideCrosshair()
+{
+  this->crosshair->setVisibility( false);
 }
 
@@ -300 +312 @@
     if (this->parentEntity->isA(Playable::staticClassID()))
       dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
+    
     weapon->setDefaultTarget(this->crosshair);
   }
@@ -416 +429 @@
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
   }
-  this->crosshair->setRotationSpeed(500);
-  this->crossHairSizeAnim->replay();
+
+  /*
+  if( this->crosshair != NULL)
+  {
+        this->crosshair->setRotationSpeed(500);
+        this->crossHairSizeAnim->replay();
+  } */
 }