Changeset 9214 in orxonox.OLD for branches/presentation

Timestamp:

Jul 5, 2006, 12:20:34 PM (18 years ago)

Author:

rennerc

Message:

new weapon demage

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (3 diffs)
• creatures/fps_player.h (modified) (1 diff)
• playable.h (modified) (1 diff)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -169 +169 @@
 
   this->initWeapon = false;
+  this->damageTicker = 0.0f;
+
   toList( OM_PLAYERS );
 }
@@ -275 +277 @@
     this->getWeaponManager().fire();
 
-    WorldEntity* target = this->aimingSystem->getNearestTarget();
-    if( target != NULL)
+//     WorldEntity* target = this->aimingSystem->getNearestTarget();
+//     if( target != NULL)
+//     {
+//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+//     }
+//     else
+//     {
+//       PRINTF(0)("nothing hit\n");
+//     }
+  }
+
+
+  //dealing damage
+  
+  if ( State::isOnline() && SharedNetworkData::getInstance()->isGameServer() )
+  {
+    this->damageTicker -= time;
+  
+    if ( this->damageTicker <= 0.0f && this->beFire() )
     {
-      PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+      this->damageTicker = 0.25;
+    
+      WorldEntity * victim = aimingSystem->getNearestTarget();
+    
+      if ( victim )
+      {
+        PRINTF(0)("FIRE: hit %s\n", victim->getClassName());
+        victim->hit( 20, this );
+      }
+      else
+      {
+        PRINTF(0)("FIRE: nothing hit\n");
+      }
     }
-    else
-    {
-      PRINTF(0)("nothing hit\n");
-    }
-  }
-
-
+  }
 
 
@@ -462 +487 @@
   if( State::isOnline())
     toList( OM_PLAYERS );
+  
+  this->damageTicker = 0.0f;
 }
 

branches/presentation/src/world_entities/creatures/fps_player.h

@@ -65 +65 @@
 
     AimingSystem*         aimingSystem;        //!< aiming system of the player
+
+    float                 damageTicker;        //!< ticker for dealing damage
 };
 

branches/presentation/src/world_entities/playable.h

@@ -90 +90 @@
   static const std::string& playmodeToString(Playable::Playmode playmode);
   static const std::string playmodeNames[];
+  
+  inline bool beFire(){ return this->bFire; }
 
 protected: