Changeset 169 for code/branches/main_reto_vs05/src/run_manager.cc

Timestamp:

Nov 5, 2007, 8:43:21 PM (16 years ago)

Author:

rgrieder

Message:

• merged "includ" folder into the "src" folder
• started writing the weaponManager
• renamed 2 files with capital letters

File:

• code/branches/main_reto_vs05/src/run_manager.cc (modified) (3 diffs)

code/branches/main_reto_vs05/src/run_manager.cc

@@ -25 +25 @@
 */
 
-
-/**
-* RunManager is the basic control object during the game.
-* 
-* The RunManger class is designed to actually "run" the main part of the
-* game. The Idea is, that you could derive from the RunManager in order
-* to distinguish between a first person shooter or a space craft shooter.
-* RunManager loads and initialises everything in the scene (like the ship,
-* the enemies in the scene, any scripts, the physics, window events,
-* environment, HUD, etc.).
-* It also captures any input from keyboard, mous, joystick (optional) or
-* Ogre (window events).
-*/
 
 #include "Ogre.h"
@@ -69 +56 @@
 #include "run_manager.h"
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
+
+  /**
+  * RunManager is the basic control object during the game.
+  * 
+  * The RunManger class is designed to actually "run" the main part of the
+  * game. The Idea is, that you could derive from the RunManager in order
+  * to distinguish between a first person shooter or a space craft shooter.
+  * RunManager loads and initialises everything in the scene (like the ship,
+  * the enemies in the scene, any scripts, the physics, window events,
+  * environment, HUD, etc.).
+  * It also captures any input from keyboard, mous, joystick (optional) or
+  * Ogre (window events).
+  */
+
 
   /**
@@ -240 +241 @@
     for (int i = 0; i < bulletsIndex_; i++)
     {
-      bullets_[i]->mNode->translate(bullets_[i]->mSpeed*deltaTime);
-      bullets_[i]->mNode->yaw(Degree(deltaTime*100));
-      bullets_[i]->mNode->roll(Degree(deltaTime*300));
+      bullets_[i]->node_->translate(bullets_[i]->speed_*deltaTime);
+      bullets_[i]->node_->yaw(Degree(deltaTime*100));
+      bullets_[i]->node_->roll(Degree(deltaTime*300));
     }