Changeset 10704 in orxonox.OLD for branches/presentation/src/world_entities/weapons/bsp_weapon.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/bsp_weapon.cc (modified) (9 diffs)

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

@@ -31 +31 @@
 *  Standard constructor
 */
-BspWeapon::BspWeapon ()
-{
-        this->init();
+BspWeapon::BspWeapon ( OM_LIST list )
+{
+        this->init( list );
 }
 
@@ -49 +49 @@
 BspWeapon::BspWeapon (const  TiXmlElement* root)
 {
-        this->init();
+        this->init( OM_GROUP_00 );
         if (root != NULL)
         {
@@ -94 +94 @@
 void BspWeapon::tick( float dt )
 {
+  PRINTF(0)("BSPWEAPON TICK: %d %f %f\n", bFire, bRate, dt );
         if (bFire) {
-                if (bRate < 0) {
+                if (bRate <= 0) {
                         bRate += fireRate;
+                        PRINTF(0)("BSPWEAPON SHOOT\n");
                         this->shoot();
                 }
@@ -111 +113 @@
 }
 
-void BspWeapon::init()
-{
-        bRate = 0;
+void BspWeapon::init( OM_LIST list )
+{
+        bRate = 0.0;
         bFire = false;
         range = 1000;
@@ -123 +125 @@
         this->aimingSystem = new AimingSystem( this );
         this->aimingSystem->setParent( this );
-        this->aimingSystem->toList(OM_GROUP_00);
+        this->aimingSystem->toList(list);
         
 }
@@ -157 +159 @@
 
         bool hit = false;
+        
+        PRINTF(0)("groups: %d %d %d %d\n", this->getOMListNumber(), this->aimingSystem->getOMListNumber(), OM_GROUP_01, OM_GROUP_00);
 
         if ( target == NULL )
@@ -170 +174 @@
                                 hit = true;
                                 printf( "HIT %s\n", target->getClassName().c_str() );
+                                target->hit( this->damage, this );
                         }
                         else
@@ -178 +183 @@
         }
 
-        if ( !hit )
-        {
-                //Vector explosionPos = this->getAbsCoor() + this->getAbsDir().apply( Vector( 1, 0, 0 ) )*shortestDist;
-
-                //TODO create explosion at explosionPos
-        }
+        
         
         
@@ -196 +196 @@
     (*it)->draw();
   }
-#if 0
+#if 1
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();