Changeset 7345 in orxonox.OLD

Timestamp:

Apr 19, 2006, 4:43:06 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Playable can now change some Playability if it is supported

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (7 diffs)

trunk/src/world_entities/playable.cc

@@ -133 +133 @@
     return false;
   else
+  {
     this->playmode = playmode;
+    return true;
+  }
 }
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -215 +215 @@
 
 /**
- * loads the Settings of a TurbineHover from an XML-element.
+ * @brief loads the Settings of a TurbineHover from an XML-element.
  * @param root the XML-element to load the Spaceship's properties from
  */
@@ -245 +245 @@
 
 /**
- *  effect that occurs after the TurbineHover is spawned
+ * @brief effect that occurs after the TurbineHover is spawned
 */
 void TurbineHover::postSpawn ()
@@ -253 +253 @@
 
 /**
- *  the action occuring if the turbine_hover left the game
+ * @brief the action occuring if the turbine_hover left the game
 */
 void TurbineHover::leftWorld ()
@@ -259 +259 @@
 
 /**
- *  this function is called, when two entities collide
+ * @brief this function is called, when two entities collide
  * @param entity: the world entity with whom it collides
  *
@@ -272 +272 @@
 
 /**
- *  the function called for each passing timeSnap
+ * @brief the function called for each passing timeSnap
  * @param time The timespan passed since last update
 */
@@ -290 +290 @@
 
 /**
- *  calculate the velocity
+ * @brief calculate the velocity
  * @param time the timeslice since the last frame
 */
@@ -362 +362 @@
     case Playable::Horizontal:
       {
-        accel.z = 0.0;
+        accel.y = 0.0;
         Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
-        accelerationDir.z = 0.0;
+        accelerationDir.y = 0.0;
 
         // this is the air friction (necessary for a smooth control)