Changeset 10698 in orxonox.OLD for trunk/src/world_entities/npcs/adm_turret.cc

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

File:

• trunk/src/world_entities/npcs/adm_turret.cc (copied) (copied from branches/adm/src/world_entities/npcs/adm_turret.cc) (3 diffs)

trunk/src/world_entities/npcs/adm_turret.cc

@@ -140 +140 @@
         this->isCeil = false;
         this->playerVisible = false;
+        this->weapon = NULL;
 
         
@@ -147 +148 @@
 {
   WorldEntity::tick(dt);
-  this->weapon->fire(false);
+  if (this->weapon) this->weapon->fire(false);
   this->updatePlayerVisible();
 
@@ -167 +168 @@
     float angle = dv1.dot(dv2);
     if (angle > 0.999)
-          {
-     this->weapon->fire(true);
-          }
+    {
+        if (this->weapon) this->weapon->fire(true);
+    }
   }
   else