[Orxonox-commit 6137] r10795 - in code/branches/fabienHS15/src/modules: overlays/hud weapons/projectiles

fvultier at orxonox.net fvultier at orxonox.net
Tue Nov 10 19:50:34 CET 2015


Author: fvultier
Date: 2015-11-10 19:50:34 +0100 (Tue, 10 Nov 2015)
New Revision: 10795

Modified:
   code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc
   code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc
   code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc
Log:


Modified: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc	2015-11-10 18:47:39 UTC (rev 10794)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc	2015-11-10 18:50:34 UTC (rev 10795)
@@ -198,7 +198,7 @@
 
         this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
 
-        materialNameState_ = ""; // Needed to set the material in the tick ater a change of the owner.
+        materialNameState_ = ""; // Needed to set the material in the tick after a change of the owner.
     }
 
     void HUDWeaponMode::changedOverlayGroup()

Modified: code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc	2015-11-10 18:47:39 UTC (rev 10794)
+++ code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc	2015-11-10 18:50:34 UTC (rev 10795)
@@ -186,8 +186,6 @@
     {
         SUPER(Rocket, tick, dt);
 
-        orxout() << "Rocket::tick" << getScale() << endl;
-
         if( this->hasLocalController() )
         {
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);

Modified: code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc	2015-11-10 18:47:39 UTC (rev 10794)
+++ code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc	2015-11-10 18:50:34 UTC (rev 10795)
@@ -116,8 +116,6 @@
     {
         SUPER(SimpleRocket, tick, dt);
 
-        orxout() << "SimpleRocket::tick" << getScale() << endl;
-
         if (GameMode::isMaster())
         {
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);




More information about the Orxonox-commit mailing list