Changeset 5433 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: include power_up.h

Location:

trunk/src

Files:

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

trunk/src/Makefile.am

@@ -64 +64 @@
                   world_entities/weapons/test_bullet.cc \
                   world_entities/weapons/crosshair.cc \
+                  world_entities/power_ups/power_up.cc \
                   subprojects/benchmark.cc
 
@@ -81 +82 @@
                  world_entities/skysphere.h \
                  world_entities/skybox.h \
-                 world_entities/power_up.h \
                  world_entities/terrain.h \
                  world_entities/satellite.h \
@@ -93 +93 @@
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/crosshair.h \
+                 world_entities/power_ups/power_up.h \
                  defs/stdincl.h \
                  defs/stdlibincl.h \

trunk/src/Makefile.in

@@ -66 +66 @@
         orxonox-test_gun.$(OBJEXT) orxonox-turret.$(OBJEXT) \
         orxonox-test_bullet.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \
-        orxonox-benchmark.$(OBJEXT)
+        orxonox-power_up.$(OBJEXT) orxonox-benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -82 +82 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-player.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-power_up.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-projectile.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-satellite.Po \
@@ -278 +279 @@
                   world_entities/weapons/test_bullet.cc \
                   world_entities/weapons/crosshair.cc \
+                  world_entities/power_ups/power_up.cc \
                   subprojects/benchmark.cc
 
@@ -295 +297 @@
                  world_entities/skysphere.h \
                  world_entities/skybox.h \
-                 world_entities/power_up.h \
                  world_entities/terrain.h \
                  world_entities/satellite.h \
@@ -307 +308 @@
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/crosshair.h \
+                 world_entities/power_ups/power_up.h \
                  defs/stdincl.h \
                  defs/stdlibincl.h \
@@ -413 +415 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-power_up.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-projectile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-satellite.Po@am__quote@
@@ -811 +814 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-crosshair.obj `if test -f 'world_entities/weapons/crosshair.cc'; then $(CYGPATH_W) 'world_entities/weapons/crosshair.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/crosshair.cc'; fi`
+
+orxonox-power_up.o: world_entities/power_ups/power_up.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-power_up.o -MD -MP -MF "$(DEPDIR)/orxonox-power_up.Tpo" -c -o orxonox-power_up.o `test -f 'world_entities/power_ups/power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/power_up.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-power_up.Tpo" "$(DEPDIR)/orxonox-power_up.Po"; else rm -f "$(DEPDIR)/orxonox-power_up.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-power_up.o `test -f 'world_entities/power_ups/power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/power_up.cc
+
+orxonox-power_up.obj: world_entities/power_ups/power_up.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-power_up.obj -MD -MP -MF "$(DEPDIR)/orxonox-power_up.Tpo" -c -o orxonox-power_up.obj `if test -f 'world_entities/power_ups/power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/power_up.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-power_up.Tpo" "$(DEPDIR)/orxonox-power_up.Po"; else rm -f "$(DEPDIR)/orxonox-power_up.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-power_up.obj `if test -f 'world_entities/power_ups/power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/power_up.cc'; fi`
 
 orxonox-benchmark.o: subprojects/benchmark.cc
@@ -950 +969 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/weapons
+        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

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 ();
-  
+
 };