[Orxonox-commit 2310] r7025 - in code/branches/presentation3/src/modules/weapons: projectiles weaponmodes

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-05-30 17:40:21 +0200 (Sun, 30 May 2010)
New Revision: 7025

Modified:
   code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
   code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
   code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
   code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h
Log:
Some cleanup.


Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-30 14:46:17 UTC (rev 7024)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-30 15:40:21 UTC (rev 7025)
@@ -44,16 +44,9 @@
 
 namespace orxonox
 {
-        /**
-    @file
-    @brief
-        SimpleRocket, follows direction from a Rocketcontroller, has fuel for 80% of its lifetime, afterwords it's fire disappears.
-    @author
-       Gabriel Nadler (Original file: Oli Scheuss)
-    */
+
     CreateFactory(SimpleRocket);
 
-
     SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator)
     {
         RegisterObject(SimpleRocket);// - register the SimpleRocket class to the core

Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h	2010-05-30 14:46:17 UTC (rev 7024)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h	2010-05-30 15:40:21 UTC (rev 7025)
@@ -26,16 +26,6 @@
  *
  */
 
-    /**
-    @file
-    @brief
-        SimpleRocket, follows direction from a Rocketcontroller, has fuel for 80% of its lifetime, afterwords it's fire disappears.
-    @author
-       Gabriel Nadler (Original file: Oli Scheuss)
-    */
-
-
-
 #ifndef _SimpleRocket_H__
 #define _SimpleRocket_H__
 
@@ -49,7 +39,12 @@
 {
     class ConeCollisionShape;
 
-
+    /**
+    @brief
+        SimpleRocket, follows direction from a Rocketcontroller, has fuel for 80% of its lifetime, afterwards it's fire disappears.
+    @author
+       Gabriel Nadler (Original file: Oli Scheuss)
+    */
     class _WeaponsExport SimpleRocket : public ControllableEntity
     {
         public:

Modified: code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2010-05-30 14:46:17 UTC (rev 7024)
+++ code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2010-05-30 15:40:21 UTC (rev 7025)
@@ -39,13 +39,7 @@
 
 namespace orxonox
 {
-       /**
-    @file
-    @brief
-        FireMode for target-seeking Rocket
-        @author
-        Gabriel Nadler (Original file: Oli Scheuss)
-        */
+
     CreateFactory(SimpleRocketFire);
 
     SimpleRocketFire::SimpleRocketFire(BaseObject* creator) : WeaponMode(creator)

Modified: code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h	2010-05-30 14:46:17 UTC (rev 7024)
+++ code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h	2010-05-30 15:40:21 UTC (rev 7025)
@@ -34,6 +34,12 @@
 
 namespace orxonox
 {
+    /**
+    @brief
+        FireMode for target-seeking Rocket
+    @author
+        Gabriel Nadler (Original file: Oli Scheuss)
+    */
     class _WeaponsExport SimpleRocketFire : public WeaponMode
     {
         public: