Changeset 10211 for code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h

Timestamp:

Jan 31, 2015, 3:51:08 PM (9 years ago)

Author:

landauf

Message:

made SpaceShip::engineList_ private again. moved function from ModularSpaceShip to SpaceShip and optimized it a little (neither iterator nor orxonox_casts are necessary here)

File:

• code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) (3 diffs)

code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -124 +124 @@
             bool hasEngine(Engine* engine) const; // Check whether the SpaceShip has a particular Engine.
             Engine* getEngine(unsigned int i); // Get the i-th Engine of the SpaceShip.
+            Engine* getEngineByName(const std::string& name);
             /**
             @brief Get the list of all Engines that are mounted on the SpaceShip.
@@ -270 +271 @@
             float stallSpeed_; //!< The forward speed where no more lift is added.
 
-            std::vector<Engine*> engineList_; //!< The list of all Engines mounted on this SpaceShip.
-
         private:
             void registerVariables();
@@ -286 +285 @@
             void backupCamera(); // Save the original position and orientation of the camera.
             void resetCamera(); // Reset the camera to its original position.
+
+            std::vector<Engine*> engineList_; //!< The list of all Engines mounted on this SpaceShip.
 
             Timer timer_;                          //!< Timer for the cooldown duration.