Changeset 10704 in orxonox.OLD for branches/presentation/src/world_entities/weapons/fps_sniper_rifle.cc

Timestamp:

Jun 15, 2007, 11:12:29 AM (17 years ago)

Author:

rennerc

Message:

FPSSniperRifle uses BspWeapon now

File:

• branches/presentation/src/world_entities/weapons/fps_sniper_rifle.cc (modified) (7 diffs)

branches/presentation/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -27 +27 @@
 #include "weapon_manager.h"
 #include "util/loading/factory.h"
+#include "debug.h"
 
 
@@ -48 +49 @@
    creates a new weapon
 */
-FPSSniperRifle::FPSSniperRifle ( int leftRight)
+FPSSniperRifle::FPSSniperRifle ( int leftRight, OM_LIST list)
   : Weapon()
 {
-  this->init();
+  this->init(list);
 
   this->leftRight = leftRight;
@@ -59 +60 @@
 FPSSniperRifle::FPSSniperRifle(const TiXmlElement* root)
 {
-  this->init();
+  this->init( OM_GROUP_01 );
 
   if (root != NULL)
@@ -76 +77 @@
 
 
-void FPSSniperRifle::init()
+void FPSSniperRifle::init(OM_LIST list)
 {
   this->registerObject(this, FPSSniperRifle::_objectList);
@@ -95 +96 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sounds/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+  //this->setActionSound(WA_SHOOT, "sounds/laser.wav");
+  //this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
 
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->setProjectileTypeC("Laser");
-  this->prepareProjectiles(20);
-
+  //this->setProjectileTypeC("Laser");
+  //this->prepareProjectiles(20);
+  this->toList( list );
+  this->weapon = new BspWeapon( this->getOMListNumber() );
+  this->weapon->setAlwaysHits( true );
+  this->weapon->setDamage( 35 );
+  this->weapon->setParent( this );
+  this->weapon->toList( list );
+    
+  this->bFire = false;
 }
 
@@ -145 +153 @@
 void FPSSniperRifle::fire()
 {
-  Projectile* pj =  this->getProjectile();
-  if (pj == NULL)
-    return;
-
-//   Explosion::explode(this, Vector(0.1,0.1,0.1));
-
-  pj->setParent(this);
-  pj->setParentMode(PNODE_ROTATE_AND_MOVE);
-
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*550 + VECTOR_RAND(5) );
-
-  pj->setAbsCoor(this->getEmissionPoint() + this->getAbsDirX() * 25.0f);
-  pj->setAbsDir(this->getAbsDir());
-  pj->activate();
+  PRINTF(0)("sniper fire\n");
+  this->bFire = true;
 }
 
@@ -190 +186 @@
 }
 
-
-
+void FPSSniperRifle::tick( float dt )
+{
+  Weapon::tick( dt );
+  this->weapon->fire( bFire );
+  
+  if ( bFire ){
+      PRINTF(0)("REAL FIRE\n");
+  }
+  bFire = false;
+}
+
+
+