Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5433 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Oct 25, 2005, 11:15:33 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: include power_up.h

Location:
trunk/src
Files:
1 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r5413 r5433  
    6464                  world_entities/weapons/test_bullet.cc \
    6565                  world_entities/weapons/crosshair.cc \
     66                  world_entities/power_ups/power_up.cc \
    6667                  subprojects/benchmark.cc
    6768
     
    8182                 world_entities/skysphere.h \
    8283                 world_entities/skybox.h \
    83                  world_entities/power_up.h \
    8484                 world_entities/terrain.h \
    8585                 world_entities/satellite.h \
     
    9393                 world_entities/weapons/test_bullet.h \
    9494                 world_entities/weapons/crosshair.h \
     95                 world_entities/power_ups/power_up.h \
    9596                 defs/stdincl.h \
    9697                 defs/stdlibincl.h \
  • trunk/src/Makefile.in

    r5413 r5433  
    6666        orxonox-test_gun.$(OBJEXT) orxonox-turret.$(OBJEXT) \
    6767        orxonox-test_bullet.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \
    68         orxonox-benchmark.$(OBJEXT)
     68        orxonox-power_up.$(OBJEXT) orxonox-benchmark.$(OBJEXT)
    6969orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    7070am__DEPENDENCIES_1 =
     
    8282@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
    8383@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-player.Po \
     84@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-power_up.Po \
    8485@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-projectile.Po \
    8586@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-satellite.Po \
     
    278279                  world_entities/weapons/test_bullet.cc \
    279280                  world_entities/weapons/crosshair.cc \
     281                  world_entities/power_ups/power_up.cc \
    280282                  subprojects/benchmark.cc
    281283
     
    295297                 world_entities/skysphere.h \
    296298                 world_entities/skybox.h \
    297                  world_entities/power_up.h \
    298299                 world_entities/terrain.h \
    299300                 world_entities/satellite.h \
     
    307308                 world_entities/weapons/test_bullet.h \
    308309                 world_entities/weapons/crosshair.h \
     310                 world_entities/power_ups/power_up.h \
    309311                 defs/stdincl.h \
    310312                 defs/stdlibincl.h \
     
    413415@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
    414416@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@
     417@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-power_up.Po@am__quote@
    415418@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-projectile.Po@am__quote@
    416419@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-satellite.Po@am__quote@
     
    811814@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    812815@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`
     816
     817orxonox-power_up.o: world_entities/power_ups/power_up.cc
     818@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; \
     819@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
     820@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.o' libtool=no @AMDEPBACKSLASH@
     821@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
     822@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     823@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
     824
     825orxonox-power_up.obj: world_entities/power_ups/power_up.cc
     826@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`; \
     827@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
     828@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.obj' libtool=no @AMDEPBACKSLASH@
     829@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
     830@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     831@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`
    813832
    814833orxonox-benchmark.o: subprojects/benchmark.cc
     
    950969
    951970distdir: $(DISTFILES)
    952         $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/weapons
     971        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
    953972        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    954973        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/src/world_entities/Makefile.am

    r5355 r5433  
    2323                  weapons/turret.cc \
    2424                  weapons/test_bullet.cc \
    25                   weapons/crosshair.cc
     25                  weapons/crosshair.cc \
     26                  power_ups/power_up.cc
    2627
    2728noinst_HEADERS = \
     
    3435                 skysphere.h \
    3536                 skybox.h \
    36                  power_up.h \
    3737                 terrain.h \
    3838                 satellite.h \
     
    4545                 weapons/turret.h \
    4646                 weapons/test_bullet.h \
    47                  weapons/crosshair.h
     47                 weapons/crosshair.h \
     48                 power_ups/power_up.h
    4849
    4950
  • trunk/src/world_entities/power_ups/power_up.h

    r5432 r5433  
    1 /*! 
     1/*!
    22 * @file power_up.h
    3   * A class representing a PowerUp in the world.
    4 */ 
     3 * @brief A class representing a PowerUp in the world.
     4*/
    55
    66#ifndef _POWER_UP_H
    77#define _POWER_UP_H
    88
    9 #include "data_tank.h"
    10 #include "ability.h"
    119#include "world_entity.h"
    1210
    13 class PowerUp : Ability, WorldEntity {
     11class PowerUp : WorldEntity {
    1412
    1513 public:
    1614  PowerUp ();
    1715  virtual ~PowerUp ();
    18  
     16
    1917};
    2018
Note: See TracChangeset for help on using the changeset viewer.