Changeset 1484

Timestamp:

May 29, 2008, 1:01:47 PM (17 years ago)

Author:

landauf

Message:

some spaceshipAI tweaks for network

Location:

code/branches/network/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)
• SpaceShipAI.cc (modified) (3 diffs)
• SpaceShipAI.h (modified) (1 diff)

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -315 +315 @@
         XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode);
         myShip_=true; // TODO: this is only a hack
+
         SpaceShip::create();
-        getFocus();
+        if (this->isExactlyA(Class(SpaceShip)))
+            getFocus();
     }
 

code/branches/network/src/orxonox/objects/SpaceShip.h

@@ -154 +154 @@
 
             float emitterRate_;
+
+        protected:
             bool myShip_;
 

code/branches/network/src/orxonox/objects/SpaceShipAI.cc

@@ -68 +68 @@
         for (int i = 4; i <= NUM_AI_TEAMS; ++i)
             this->teamColours_[i] = ColourValue(rnd(), rnd(), rnd(), 1);
-
-        actionTimer_.setTimer(ACTION_INTERVAL, true, this, createExecutor(createFunctor(&SpaceShipAI::action)));
+    }
+
+    void SpaceShipAI::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SpaceShip::XMLPort(xmlelement, mode);
+        myShip_=true;
+
+        this->actionTimer_.setTimer(ACTION_INTERVAL, true, this, createExecutor(createFunctor(&SpaceShipAI::action)));
     }
 
@@ -88 +94 @@
             newenemy->setRotDamp(1.0);
             Element xmlelement;
-            newenemy->create();
+            newenemy->XMLPort(xmlelement, XMLPort::LoadObject);
         }
     }
@@ -218 +224 @@
     void SpaceShipAI::searchNewTargetPosition()
     {
-        this->targetPosition_ += Vector3(rnd(-10000,10000), rnd(-10000,10000), rnd(-10000,10000));
+        this->targetPosition_ = Vector3(rnd(-5000,5000), rnd(-5000,5000), rnd(-5000,5000));
         this->bHasTargetPosition_ = true;
     }

code/branches/network/src/orxonox/objects/SpaceShipAI.h

@@ -44 +44 @@
         public:
             SpaceShipAI();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             static void createEnemy(int num);
             static void killEnemies(int num);