[Orxonox-commit 1348] r6066 - in code/branches/particles2/src/modules/weapons: projectiles weaponmodes

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-15 13:37:45 +0100 (Sun, 15 Nov 2009)
New Revision: 6066

Modified:
   code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc
   code/branches/particles2/src/modules/weapons/projectiles/Rocket.h
   code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc
   code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h
Log:
Fixed msvc build: file migration problem.

Modified: code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc	2009-11-15 12:15:42 UTC (rev 6065)
+++ code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc	2009-11-15 12:37:45 UTC (rev 6066)
@@ -20,9 +20,9 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Reto Grieder
+ *      Oliver Scheuss
  *   Co-authors:
- *      Martin Stypinski
+ *      ...
  *
  */
 

Modified: code/branches/particles2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/particles2/src/modules/weapons/projectiles/Rocket.h	2009-11-15 12:15:42 UTC (rev 6065)
+++ code/branches/particles2/src/modules/weapons/projectiles/Rocket.h	2009-11-15 12:37:45 UTC (rev 6066)
@@ -20,16 +20,16 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Reto Grieder
+ *      Oliver Scheuss
  *   Co-authors:
- *      Martin Stypinski
+ *      ...
  *
  */
 
 #ifndef _Rocket_H__
 #define _Rocket_H__
 
-#include "OrxonoxPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "worldentities/ControllableEntity.h"
 
 namespace orxonox
@@ -43,7 +43,7 @@
     @author
         Oli Scheuss
     */
-    class _OrxonoxExport Rocket : public ControllableEntity
+    class _WeaponsExport Rocket : public ControllableEntity
     {
         public:
             Rocket(BaseObject* creator);

Modified: code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc
===================================================================
--- code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc	2009-11-15 12:15:42 UTC (rev 6065)
+++ code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc	2009-11-15 12:37:45 UTC (rev 6066)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Martin Polak
+ *      Oliver Scheuss
  *   Co-authors:
  *      ...
  *

Modified: code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h
===================================================================
--- code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h	2009-11-15 12:15:42 UTC (rev 6065)
+++ code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h	2009-11-15 12:37:45 UTC (rev 6066)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Martin Polak
+ *      Oliver Scheuss
  *   Co-authors:
  *      ...
  *