Changeset 5559 in orxonox.OLD for branches/world_entities/src/world_entities/player.cc

Timestamp:

Nov 13, 2005, 4:30:07 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: simple-aiming function, with visible targetting-system

File:

• branches/world_entities/src/world_entities/player.cc (modified) (1 diff)

branches/world_entities/src/world_entities/player.cc

@@ -341 +341 @@
 void Player::ADDWEAPON()
 {
-  Weapon* turret1;
-  if ((float)rand()/RAND_MAX < .7)
-    turret1 = new Turret(this->weaponMan);
+  Weapon* turret;
+  if ((float)rand()/RAND_MAX < .1)
+  {
+    turret = new Turret(this->weaponMan);
+    this->weaponMan->addWeapon(turret, 2);
+    this->weaponMan->changeWeaponConfig(2);
+  }
   else
-    turret1 = new AimingTurret(this->weaponMan);
-
-  turret1->setName("Turret");
-  turret1->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-
-  this->weaponMan->addWeapon(turret1, 2);
-
-  this->weaponMan->changeWeaponConfig(2);
-}
+  {
+    turret = new AimingTurret(this->weaponMan);
+    this->weaponMan->addWeapon(turret, 3);
+
+    this->weaponMan->changeWeaponConfig(3);
+  }
+
+  turret->setName("Turret");
+  turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
+}