Changeset 7075 for code/branches/presentation3/src/orxonox/controllers

Timestamp:

Jun 2, 2010, 12:27:03 AM (15 years ago)

Author:

landauf

Message:

removed some tabs and adjusted formatting in some fps related files

File:

• code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified) (3 diffs)

code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc

@@ -216 +216 @@
                 {
                     if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
-                        {this->showOverlays();}
-                        
-                    if (this->getControllableEntity() &&  this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))\
-                        {this->showOverlays();
-                        this->hideArrows();}
+                        this->showOverlays();
+                    else if (this->getControllableEntity() &&  this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+                    {
+                        this->showOverlays();
+                        this->hideArrows();
+                    }
 
                     this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5f-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5f-overlaySize_/2));
@@ -378 +379 @@
                 // Try to cast the user pointer
                 WorldEntity* wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
-                
+
                 // make sure we don't shoot ourselves
                 if( wePtr==myWe )
                     continue;
-                
+
                 if (wePtr)
                 {
@@ -592 +593 @@
         }
     }
-        
-
-    
+
+
+