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

Timestamp:

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

Author:

snellen

Message:

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

Location:

trunk/src/world_entities/npcs

Files:

• actionbox_enemy.cc (copied) (copied from branches/vs-enhencements/src/world_entities/npcs/actionbox_enemy.cc)
• actionbox_enemy.h (copied) (copied from branches/vs-enhencements/src/world_entities/npcs/actionbox_enemy.h)
• adm_turret.cc (copied) (copied from branches/adm/src/world_entities/npcs/adm_turret.cc) (3 diffs)
• adm_turret.h (copied) (copied from branches/adm/src/world_entities/npcs/adm_turret.h)
• npc.cc (modified) (1 diff)

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

trunk/src/world_entities/npcs/npc.cc

@@ -407 +407 @@
       {
         int slot = ws->getWeaponSlot();
-        int side = ws->getWeaponSide();
+//         int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used
         this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
         this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());