Changeset 9615 in orxonox.OLD for branches/proxy/src/world_entities/npcs

Timestamp:

Jul 30, 2006, 12:51:58 PM (18 years ago)

Author:

bensch

Message:

AimingTurret is better suited for network, as the projectiles are not connected to anything.
also it makes the game a little bit easier, and more fun as the turrets move around

Location:

branches/proxy/src/world_entities/npcs

Files:

• network_turret.cc (modified) (3 diffs)
• network_turret.h (modified) (2 diffs)

branches/proxy/src/world_entities/npcs/network_turret.cc

@@ -29 +29 @@
 #include "effects/explosion.h"
 
-#include "weapons/targeting_turret.h"
+#include "weapons/aiming_turret.h"
 
 CREATE_FACTORY(NetworkTurret, CL_NETWORK_TURRET);
@@ -65 +65 @@
   this->loadModel("models/ground_turret_#.obj", 5);
 
-  this->weapon = new TargetingTurret();
+  this->weapon = new AimingTurret();
   this->weapon->loadModel("models/guns/turret2.obj", 10);
   this->weapon->setParent(this);
@@ -117 +117 @@
     diffVec = ( (*entity)->getAbsCoor() - this->getAbsCoor() );
 
-    if ( diffVec.len() < 1000 )//&&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
+    if ( diffVec.len() < 100.0 )//&&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
     {
       //if (this->getParent() != (*entity))

branches/proxy/src/world_entities/npcs/network_turret.h

@@ -9 +9 @@
 #include "npcs/npc.h"
 
-class TargetingTurret;
+class AimingTurret;
 
 //! A Class to ...
@@ -42 +42 @@
 private:
   PNode  weaponHolder;
-  TargetingTurret *weapon;
+  AimingTurret *weapon;
 
   int    targetGroup;