Changeset 10707 in orxonox.OLD for branches/presentation/src

Timestamp:

Jun 16, 2007, 12:32:59 AM (17 years ago)

Author:

rennerc

Message:

player can kill adm now

Location:

branches/presentation/src/world_entities/weapons

Files:

• bsp_weapon.cc (modified) (3 diffs)
• weapon.h (modified) (1 diff)

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

@@ -157 +157 @@
         WorldEntity* target = aimingSystem->getNearestTarget();
         aimingSystem->flushList();
-
-        bool hit = false;
         
-        PRINTF(0)("groups: %d %d %d %d\n", this->getOMListNumber(), this->aimingSystem->getOMListNumber(), OM_GROUP_01, OM_GROUP_00);
+        PRINTF(0)("---------------------------------------groups: %d %d %d %d\n", this->getOMListNumber(), this->aimingSystem->getOMListNumber(), OM_GROUP_01, OM_GROUP_00);
 
         if ( target == NULL )
@@ -172 +170 @@
                         float p = 1 - res*res/range/range;
                         if (r < p ){
-                                hit = true;
                                 printf( "HIT %s\n", target->getClassName().c_str() );
                                 target->hit( this->damage, this );
@@ -180 +177 @@
                         
                 }
-                else hit = true;
+                else 
+                {
+                        printf( "HIT %s\n", target->getClassName().c_str() );
+                        target->hit( this->damage, this );
+                }
         }
 

branches/presentation/src/world_entities/weapons/weapon.h

@@ -173 +173 @@
     bool tickW(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
 
-    virtual void tick(float dt) { tickW(dt); };
+    virtual void tick(float dt) { WorldEntity::tick(dt); tickW(dt); };
 
     bool check() const;