[Orxonox-commit 4221] r8892 - in code/trunk/src/orxonox: controllers worldentities/pawns
jo at orxonox.net
jo at orxonox.net
Wed Oct 12 20:35:32 CEST 2011
Author: jo
Date: 2011-10-12 20:35:32 +0200 (Wed, 12 Oct 2011)
New Revision: 8892
Modified:
code/trunk/src/orxonox/controllers/ArtificialController.cc
code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc
Log:
Small adjustments.
Modified: code/trunk/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/ArtificialController.cc 2011-10-12 17:50:43 UTC (rev 8891)
+++ code/trunk/src/orxonox/controllers/ArtificialController.cc 2011-10-12 18:35:32 UTC (rev 8892)
@@ -91,7 +91,7 @@
this->target_.setCallback(createFunctor(&ArtificialController::targetDied, this));
this->bSetupWorked = false;
- this->botlevel_ = 0.5f;
+ this->botlevel_ = 0.2f;
this->mode_ = DEFAULT;////Vector-implementation: mode_.push_back(DEFAULT);
this->timeout_ = 0;
this->currentWaypoint_ = 0;
Modified: code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc 2011-10-12 17:50:43 UTC (rev 8891)
+++ code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc 2011-10-12 18:35:32 UTC (rev 8892)
@@ -296,7 +296,12 @@
this->resetCamera();
}
}
-
+ /**
+ @brief
+ Add an Engine to the SpaceShip.
+ @param engine
+ A pointer to the Engine to be added.
+ */
void SpaceShip::addEngine(orxonox::Engine* engine)
{
OrxAssert(engine != NULL, "The engine cannot be NULL.");
More information about the Orxonox-commit
mailing list