Changeset 10725 in orxonox.OLD

Timestamp:

Jun 19, 2007, 11:59:25 PM (17 years ago)

Author:

rennerc

Message:

actionboxenemy

Location:

branches/presentation/src/world_entities/npcs

Files:

• actionbox_enemy.cc (modified) (5 diffs)
• actionbox_enemy.h (modified) (1 diff)

branches/presentation/src/world_entities/npcs/actionbox_enemy.cc

@@ -51 +51 @@
   
   this->onEscape = false;
-  
+  this->escaped = false;
+  this->endPoint = Vector(0, 0, 0);
   if ( root )
     this->loadParams( root );
@@ -97 +98 @@
   this->weaponMan.getFixedTarget()->setRelCoor(100000,0,0);
   this->weaponMan.hideCrosshair();
+  
+  if ( root )
+  {
+    this->loadParams( root );
+  }
 }
 
@@ -106 +112 @@
 {
   WorldEntity::loadParams( root );
+  
+  LoadParam(root, "endPoint", this, ActionboxEnemy, setEndPoint);
 }
 
 void ActionboxEnemy::tick( float dt )
 {
+  if ( escaped )
+  {
+    moveTowards( endPoint, endPoint - this->getAbsCoor(), dt );
+    return;
+  }
+  
   weaponMan.tick( dt );
   this->bFire = false;
@@ -122 +136 @@
   
   if ( behindPlayer )
+  {
+    this->escaped = true;
+    PRINTF(0)("MOVING TOWARDS ENDPOINT\n");
     return;
+  }
   
   myDir = this->getAbsDir();
@@ -189 +207 @@
     onEscape = true;
     
-    Vector rEscapePoint = box->getAbsDir().apply(escapePoint);
+    Vector rEscapePoint = box->getAbsDir().apply(escapePoint + Vector( -10, 0, 0 ));
     Vector targetPos = State::getPlayer()->getPlayable()->getAbsCoor() + rEscapePoint;
     Vector targetDir = State::getPlayer()->getPlayable()->getAbsCoor() + rEscapePoint - this->getAbsCoor();
-    moveTowards( targetPos, targetDir, dt );    
+    moveTowards( targetPos, targetDir, dt );
   }
 }

branches/presentation/src/world_entities/npcs/actionbox_enemy.h

@@ -39 +39 @@
     Vector     escapePoint;
     bool       onEscape;
+    bool       escaped;
+    Vector     endPoint;
+    
+    void setEndPoint( float x, float y, float z ){ endPoint = Vector(x, y, z); }
     
     void attackPlayer( ActionBox* box, float dt );