Changeset 5433 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Oct 25, 2005, 11:15:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: include power_up.h

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (3 diffs)
• power_ups (added)
• power_ups/power_up.cc (moved) (moved from trunk/src/world_entities/power_up.cc)
• power_ups/power_up.h (moved) (moved from trunk/src/world_entities/power_up.h) (1 diff)

trunk/src/world_entities/Makefile.am

@@ -23 +23 @@
                   weapons/turret.cc \
                   weapons/test_bullet.cc \
-                  weapons/crosshair.cc
+                  weapons/crosshair.cc \
+                  power_ups/power_up.cc
 
 noinst_HEADERS = \
@@ -34 +35 @@
                  skysphere.h \
                  skybox.h \
-                 power_up.h \
                  terrain.h \
                  satellite.h \
@@ -45 +45 @@
                  weapons/turret.h \
                  weapons/test_bullet.h \
-                 weapons/crosshair.h
+                 weapons/crosshair.h \
+                 power_ups/power_up.h
 
 

trunk/src/world_entities/power_ups/power_up.h

@@ -1 @@
-/*! 
+/*!
  * @file power_up.h
-  *  A class representing a PowerUp in the world.
-*/ 
+ * @brief A class representing a PowerUp in the world.
+*/
 
 #ifndef _POWER_UP_H
 #define _POWER_UP_H
 
-#include "data_tank.h"
-#include "ability.h"
 #include "world_entity.h"
 
-class PowerUp : Ability, WorldEntity { 
+class PowerUp : WorldEntity {
 
  public:
   PowerUp ();
   virtual ~PowerUp ();
-  
+
 };