Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5456 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Oct 30, 2005, 12:54:23 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: added Lasers and Rockets Class as TestBullet is not the best Name

Location:
trunk/src
Files:
8 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r5450 r5456  
    1010orxonox_CPPFLAGS = -DIS_ORXONOX
    1111
    12 orxonox_DEPENDENCIES = lib/libORXlibs.la \
     12orxonox_DEPENDENCIES = world_entities/libORXworld_entities.la \
     13                       lib/libORXlibs.la \
    1314                       util/libORXutils.la
    1415
  • trunk/src/Makefile.in

    r5434 r5456  
    5555am_orxonox_OBJECTS = orxonox-orxonox.$(OBJEXT) \
    5656        orxonox-story_entity.$(OBJEXT) orxonox-campaign.$(OBJEXT) \
    57         orxonox-world.$(OBJEXT) orxonox-world_entity.$(OBJEXT) \
    58         orxonox-camera.$(OBJEXT) orxonox-player.$(OBJEXT) \
    59         orxonox-npc.$(OBJEXT) orxonox-npc2.$(OBJEXT) \
    60         orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
    61         orxonox-skybox.$(OBJEXT) orxonox-terrain.$(OBJEXT) \
    62         orxonox-satellite.$(OBJEXT) \
    63         orxonox-character_attributes.$(OBJEXT) \
    64         orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \
    65         orxonox-weapon.$(OBJEXT) orxonox-projectile.$(OBJEXT) \
    66         orxonox-test_gun.$(OBJEXT) orxonox-turret.$(OBJEXT) \
    67         orxonox-test_bullet.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \
    68         orxonox-power_up.$(OBJEXT) orxonox-turret_power_up.$(OBJEXT) \
    69         orxonox-benchmark.$(OBJEXT)
     57        orxonox-world.$(OBJEXT) orxonox-benchmark.$(OBJEXT)
    7058orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    7159am__DEPENDENCIES_1 =
     
    7462am__depfiles_maybe = depfiles
    7563@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox-benchmark.Po \
    76 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-camera.Po \
    7764@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-campaign.Po \
    78 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-character_attributes.Po \
    79 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-crosshair.Po \
    80 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-environment.Po \
    81 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc.Po \
    82 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc2.Po \
    8365@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
    84 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-player.Po \
    85 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-power_up.Po \
    86 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-projectile.Po \
    87 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-satellite.Po \
    88 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-skybox.Po \
    89 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-skysphere.Po \
    9066@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-story_entity.Po \
    91 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-terrain.Po \
    92 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-test_bullet.Po \
    93 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-test_entity.Po \
    94 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-test_gun.Po \
    95 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-turret.Po \
    96 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-turret_power_up.Po \
    97 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-weapon.Po \
    98 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-weapon_manager.Po \
    99 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-world.Po \
    100 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-world_entity.Po
     67@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-world.Po
    10168CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    10269        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     70LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     71        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     72        $(AM_CXXFLAGS) $(CXXFLAGS)
    10373CXXLD = $(CXX)
    104 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    105         -o $@
     74CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     75        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    10676SOURCES = $(orxonox_SOURCES)
    10777DIST_SOURCES = $(orxonox_SOURCES)
     
    11585ETAGS = etags
    11686CTAGS = ctags
    117 DIST_SUBDIRS = lib util subprojects .
     87DIST_SUBDIRS = lib util world_entities subprojects .
    11888DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    11989ACLOCAL = @ACLOCAL@
     
    12191AMDEP_TRUE = @AMDEP_TRUE@
    12292AMTAR = @AMTAR@
     93AR = @AR@
    12394AUTOCONF = @AUTOCONF@
    12495AUTOHEADER = @AUTOHEADER@
     
    133104CURL_LIBS = @CURL_LIBS@
    134105CXX = @CXX@
     106CXXCPP = @CXXCPP@
    135107CXXDEPMODE = @CXXDEPMODE@
    136108CXXFLAGS = @CXXFLAGS@
     
    144116DOXYGEN_FALSE = @DOXYGEN_FALSE@
    145117DOXYGEN_TRUE = @DOXYGEN_TRUE@
     118ECHO = @ECHO@
    146119ECHO_C = @ECHO_C@
    147120ECHO_N = @ECHO_N@
     
    149122EGREP = @EGREP@
    150123EXEEXT = @EXEEXT@
     124F77 = @F77@
     125FFLAGS = @FFLAGS@
    151126GPROF = @GPROF@
    152127GTK2_CFLAGS = @GTK2_CFLAGS@
     
    163138LIBOBJS = @LIBOBJS@
    164139LIBS = @LIBS@
     140LIBTOOL = @LIBTOOL@
     141LN_S = @LN_S@
    165142LTLIBOBJS = @LTLIBOBJS@
    166143MAKEINFO = @MAKEINFO@
     
    182159SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    183160VERSION = @VERSION@
     161ac_ct_AR = @ac_ct_AR@
    184162ac_ct_CC = @ac_ct_CC@
    185163ac_ct_CXX = @ac_ct_CXX@
     164ac_ct_F77 = @ac_ct_F77@
    186165ac_ct_RANLIB = @ac_ct_RANLIB@
    187166ac_ct_STRIP = @ac_ct_STRIP@
     
    227206MAINSRCDIR = .
    228207orxonox_CPPFLAGS = -DIS_ORXONOX
    229 orxonox_DEPENDENCIES = lib/libORXlibs.a \
    230                        util/libORXutils.a \
    231                        lib/gui/gtk_gui/libORXgui.a \
    232                        lib/graphics/importer/libORXimporter.a \
    233                        lib/graphics/libORXgraphics.a \
    234                        lib/sound/libORXsound.a \
    235                        lib/event/libORXevent.a \
    236                        lib/physics/libORXphysics.a \
    237                        lib/particles/libORXparticles.a \
    238                        lib/collision_detection/libORXcd.a \
    239                        lib/graphics/spatial_separation/libORXquadtree.a \
    240                        lib/tinyxml/libtinyxml.a \
    241                        lib/gui/gl_gui/libORXglgui.a \
    242                        lib/shell/libORXshell.a
    243 
    244 orxonox_LDADD = util/libORXutils.a \
    245                 lib/libORXlibs.a \
    246                 lib/gui/gtk_gui/libORXgui.a \
    247                 lib/graphics/importer/libORXimporter.a \
    248                 lib/graphics/libORXgraphics.a \
    249                 lib/sound/libORXsound.a \
    250                 lib/event/libORXevent.a \
    251                 lib/physics/libORXphysics.a \
    252                 lib/particles/libORXparticles.a \
    253                 lib/collision_detection/libORXcd.a \
    254                 lib/graphics/spatial_separation/libORXquadtree.a \
    255                 lib/tinyxml/libtinyxml.a \
    256                 lib/gui/gl_gui/libORXglgui.a \
    257                 lib/shell/libORXshell.a \
     208orxonox_DEPENDENCIES = world_entities/libORXworld_entities.la \
     209                       lib/libORXlibs.la \
     210                       util/libORXutils.la
     211
     212orxonox_LDADD = world_entities/libORXworld_entities.la \
     213                util/libORXutils.la \
     214                lib/libORXlibs.la \
    258215                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    259216
     
    262219                  story_entities/campaign.cc \
    263220                  story_entities/world.cc \
    264                   world_entities/world_entity.cc \
    265                   world_entities/camera.cc \
    266                   world_entities/player.cc \
    267                   world_entities/npc.cc \
    268                   world_entities/npc2.cc \
    269                   world_entities/environment.cc \
    270                   world_entities/skysphere.cc \
    271                   world_entities/skybox.cc \
    272                   world_entities/terrain.cc \
    273                   world_entities/satellite.cc \
    274                   world_entities/character_attributes.cc \
    275                   world_entities/test_entity.cc \
    276                   world_entities/weapons/weapon_manager.cc \
    277                   world_entities/weapons/weapon.cc \
    278                   world_entities/weapons/projectile.cc \
    279                   world_entities/weapons/test_gun.cc \
    280                   world_entities/weapons/turret.cc \
    281                   world_entities/weapons/test_bullet.cc \
    282                   world_entities/weapons/crosshair.cc \
    283                   world_entities/power_ups/power_up.cc \
    284                   world_entities/power_ups/turret_power_up.cc \
    285221                  subprojects/benchmark.cc
    286222
     
    291227                 story_entities/story_def.h \
    292228                 story_entities/campaign.h \
    293                  story_entities/world.h \
    294                  world_entities/world_entity.h \
    295                  world_entities/camera.h \
    296                  world_entities/player.h \
    297                  world_entities/npc.h \
    298                  world_entities/npc2.h \
    299                  world_entities/environment.h \
    300                  world_entities/skysphere.h \
    301                  world_entities/skybox.h \
    302                  world_entities/terrain.h \
    303                  world_entities/satellite.h \
    304                  world_entities/character_attributes.h \
    305                  world_entities/test_entity.h \
    306                  world_entities/weapons/weapon_manager.h \
    307                  world_entities/weapons/weapon.h \
    308                  world_entities/weapons/projectile.h \
    309                  world_entities/weapons/test_gun.h \
    310                  world_entities/weapons/turret.h \
    311                  world_entities/weapons/test_bullet.h \
    312                  world_entities/weapons/crosshair.h \
    313                  world_entities/power_ups/power_up.h \
    314                  world_entities/power_ups/turret_power_up.h \
    315229                 defs/stdincl.h \
    316230                 defs/stdlibincl.h \
     
    340254SUBDIRS = lib \
    341255          util \
     256          world_entities \
    342257          $(SUB_PROGS) \
    343258          .
     
    346261
    347262.SUFFIXES:
    348 .SUFFIXES: .cc .o .obj
     263.SUFFIXES: .cc .lo .o .obj
    349264$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    350265        @for dep in $?; do \
     
    382297          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    383298          if test -f $$p \
     299             || test -f $$p1 \
    384300          ; then \
    385301            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    386            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
    387            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
     302           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     303           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    388304          else :; fi; \
    389305        done
     
    398314
    399315clean-binPROGRAMS:
    400         -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
     316        @list='$(bin_PROGRAMS)'; for p in $$list; do \
     317          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     318          echo " rm -f $$p $$f"; \
     319          rm -f $$p $$f ; \
     320        done
    401321orxonox$(EXEEXT): $(orxonox_OBJECTS) $(orxonox_DEPENDENCIES)
    402322        @rm -f orxonox$(EXEEXT)
     
    410330
    411331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-benchmark.Po@am__quote@
    412 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-camera.Po@am__quote@
    413332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-campaign.Po@am__quote@
    414 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-character_attributes.Po@am__quote@
    415 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-crosshair.Po@am__quote@
    416 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-environment.Po@am__quote@
    417 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc.Po@am__quote@
    418 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc2.Po@am__quote@
    419333@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
    420 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@
    421 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-power_up.Po@am__quote@
    422 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-projectile.Po@am__quote@
    423 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-satellite.Po@am__quote@
    424 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-skybox.Po@am__quote@
    425 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-skysphere.Po@am__quote@
    426334@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-story_entity.Po@am__quote@
    427 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-terrain.Po@am__quote@
    428 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_bullet.Po@am__quote@
    429 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_entity.Po@am__quote@
    430 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_gun.Po@am__quote@
    431 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret.Po@am__quote@
    432 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret_power_up.Po@am__quote@
    433 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon.Po@am__quote@
    434 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon_manager.Po@am__quote@
    435335@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-world.Po@am__quote@
    436 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-world_entity.Po@am__quote@
    437336
    438337.cc.o:
     
    452351@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    453352
     353.cc.lo:
     354@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     355@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     356@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     357@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     358@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     359@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     360
    454361orxonox-orxonox.o: orxonox.cc
    455362@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-orxonox.o -MD -MP -MF "$(DEPDIR)/orxonox-orxonox.Tpo" -c -o orxonox-orxonox.o `test -f 'orxonox.cc' || echo '$(srcdir)/'`orxonox.cc; \
     
    468375@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-orxonox.obj `if test -f 'orxonox.cc'; then $(CYGPATH_W) 'orxonox.cc'; else $(CYGPATH_W) '$(srcdir)/orxonox.cc'; fi`
    469376
     377orxonox-orxonox.lo: orxonox.cc
     378@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-orxonox.lo -MD -MP -MF "$(DEPDIR)/orxonox-orxonox.Tpo" -c -o orxonox-orxonox.lo `test -f 'orxonox.cc' || echo '$(srcdir)/'`orxonox.cc; \
     379@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-orxonox.Tpo" "$(DEPDIR)/orxonox-orxonox.Plo"; else rm -f "$(DEPDIR)/orxonox-orxonox.Tpo"; exit 1; fi
     380@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='orxonox.cc' object='orxonox-orxonox.lo' libtool=yes @AMDEPBACKSLASH@
     381@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-orxonox.Plo' tmpdepfile='$(DEPDIR)/orxonox-orxonox.TPlo' @AMDEPBACKSLASH@
     382@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     383@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-orxonox.lo `test -f 'orxonox.cc' || echo '$(srcdir)/'`orxonox.cc
     384
    470385orxonox-story_entity.o: story_entities/story_entity.cc
    471386@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-story_entity.o -MD -MP -MF "$(DEPDIR)/orxonox-story_entity.Tpo" -c -o orxonox-story_entity.o `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc; \
     
    484399@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-story_entity.obj `if test -f 'story_entities/story_entity.cc'; then $(CYGPATH_W) 'story_entities/story_entity.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/story_entity.cc'; fi`
    485400
     401orxonox-story_entity.lo: story_entities/story_entity.cc
     402@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-story_entity.lo -MD -MP -MF "$(DEPDIR)/orxonox-story_entity.Tpo" -c -o orxonox-story_entity.lo `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc; \
     403@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-story_entity.Tpo" "$(DEPDIR)/orxonox-story_entity.Plo"; else rm -f "$(DEPDIR)/orxonox-story_entity.Tpo"; exit 1; fi
     404@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/story_entity.cc' object='orxonox-story_entity.lo' libtool=yes @AMDEPBACKSLASH@
     405@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-story_entity.Plo' tmpdepfile='$(DEPDIR)/orxonox-story_entity.TPlo' @AMDEPBACKSLASH@
     406@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     407@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-story_entity.lo `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc
     408
    486409orxonox-campaign.o: story_entities/campaign.cc
    487410@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-campaign.o -MD -MP -MF "$(DEPDIR)/orxonox-campaign.Tpo" -c -o orxonox-campaign.o `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc; \
     
    500423@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-campaign.obj `if test -f 'story_entities/campaign.cc'; then $(CYGPATH_W) 'story_entities/campaign.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/campaign.cc'; fi`
    501424
     425orxonox-campaign.lo: story_entities/campaign.cc
     426@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-campaign.lo -MD -MP -MF "$(DEPDIR)/orxonox-campaign.Tpo" -c -o orxonox-campaign.lo `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc; \
     427@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-campaign.Tpo" "$(DEPDIR)/orxonox-campaign.Plo"; else rm -f "$(DEPDIR)/orxonox-campaign.Tpo"; exit 1; fi
     428@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/campaign.cc' object='orxonox-campaign.lo' libtool=yes @AMDEPBACKSLASH@
     429@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-campaign.Plo' tmpdepfile='$(DEPDIR)/orxonox-campaign.TPlo' @AMDEPBACKSLASH@
     430@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     431@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-campaign.lo `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc
     432
    502433orxonox-world.o: story_entities/world.cc
    503434@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-world.o -MD -MP -MF "$(DEPDIR)/orxonox-world.Tpo" -c -o orxonox-world.o `test -f 'story_entities/world.cc' || echo '$(srcdir)/'`story_entities/world.cc; \
     
    516447@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-world.obj `if test -f 'story_entities/world.cc'; then $(CYGPATH_W) 'story_entities/world.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/world.cc'; fi`
    517448
    518 orxonox-world_entity.o: world_entities/world_entity.cc
    519 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-world_entity.o -MD -MP -MF "$(DEPDIR)/orxonox-world_entity.Tpo" -c -o orxonox-world_entity.o `test -f 'world_entities/world_entity.cc' || echo '$(srcdir)/'`world_entities/world_entity.cc; \
    520 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-world_entity.Tpo" "$(DEPDIR)/orxonox-world_entity.Po"; else rm -f "$(DEPDIR)/orxonox-world_entity.Tpo"; exit 1; fi
    521 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/world_entity.cc' object='orxonox-world_entity.o' libtool=no @AMDEPBACKSLASH@
    522 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-world_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-world_entity.TPo' @AMDEPBACKSLASH@
    523 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    524 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-world_entity.o `test -f 'world_entities/world_entity.cc' || echo '$(srcdir)/'`world_entities/world_entity.cc
    525 
    526 orxonox-world_entity.obj: world_entities/world_entity.cc
    527 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-world_entity.obj -MD -MP -MF "$(DEPDIR)/orxonox-world_entity.Tpo" -c -o orxonox-world_entity.obj `if test -f 'world_entities/world_entity.cc'; then $(CYGPATH_W) 'world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/world_entity.cc'; fi`; \
    528 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-world_entity.Tpo" "$(DEPDIR)/orxonox-world_entity.Po"; else rm -f "$(DEPDIR)/orxonox-world_entity.Tpo"; exit 1; fi
    529 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/world_entity.cc' object='orxonox-world_entity.obj' libtool=no @AMDEPBACKSLASH@
    530 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-world_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-world_entity.TPo' @AMDEPBACKSLASH@
    531 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    532 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-world_entity.obj `if test -f 'world_entities/world_entity.cc'; then $(CYGPATH_W) 'world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/world_entity.cc'; fi`
    533 
    534 orxonox-camera.o: world_entities/camera.cc
    535 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-camera.o -MD -MP -MF "$(DEPDIR)/orxonox-camera.Tpo" -c -o orxonox-camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc; \
    536 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-camera.Tpo" "$(DEPDIR)/orxonox-camera.Po"; else rm -f "$(DEPDIR)/orxonox-camera.Tpo"; exit 1; fi
    537 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/camera.cc' object='orxonox-camera.o' libtool=no @AMDEPBACKSLASH@
    538 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-camera.Po' tmpdepfile='$(DEPDIR)/orxonox-camera.TPo' @AMDEPBACKSLASH@
    539 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    540 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc
    541 
    542 orxonox-camera.obj: world_entities/camera.cc
    543 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-camera.obj -MD -MP -MF "$(DEPDIR)/orxonox-camera.Tpo" -c -o orxonox-camera.obj `if test -f 'world_entities/camera.cc'; then $(CYGPATH_W) 'world_entities/camera.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/camera.cc'; fi`; \
    544 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-camera.Tpo" "$(DEPDIR)/orxonox-camera.Po"; else rm -f "$(DEPDIR)/orxonox-camera.Tpo"; exit 1; fi
    545 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/camera.cc' object='orxonox-camera.obj' libtool=no @AMDEPBACKSLASH@
    546 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-camera.Po' tmpdepfile='$(DEPDIR)/orxonox-camera.TPo' @AMDEPBACKSLASH@
    547 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    548 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-camera.obj `if test -f 'world_entities/camera.cc'; then $(CYGPATH_W) 'world_entities/camera.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/camera.cc'; fi`
    549 
    550 orxonox-player.o: world_entities/player.cc
    551 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-player.o -MD -MP -MF "$(DEPDIR)/orxonox-player.Tpo" -c -o orxonox-player.o `test -f 'world_entities/player.cc' || echo '$(srcdir)/'`world_entities/player.cc; \
    552 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-player.Tpo" "$(DEPDIR)/orxonox-player.Po"; else rm -f "$(DEPDIR)/orxonox-player.Tpo"; exit 1; fi
    553 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/player.cc' object='orxonox-player.o' libtool=no @AMDEPBACKSLASH@
    554 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-player.Po' tmpdepfile='$(DEPDIR)/orxonox-player.TPo' @AMDEPBACKSLASH@
    555 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    556 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-player.o `test -f 'world_entities/player.cc' || echo '$(srcdir)/'`world_entities/player.cc
    557 
    558 orxonox-player.obj: world_entities/player.cc
    559 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-player.obj -MD -MP -MF "$(DEPDIR)/orxonox-player.Tpo" -c -o orxonox-player.obj `if test -f 'world_entities/player.cc'; then $(CYGPATH_W) 'world_entities/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/player.cc'; fi`; \
    560 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-player.Tpo" "$(DEPDIR)/orxonox-player.Po"; else rm -f "$(DEPDIR)/orxonox-player.Tpo"; exit 1; fi
    561 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/player.cc' object='orxonox-player.obj' libtool=no @AMDEPBACKSLASH@
    562 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-player.Po' tmpdepfile='$(DEPDIR)/orxonox-player.TPo' @AMDEPBACKSLASH@
    563 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    564 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-player.obj `if test -f 'world_entities/player.cc'; then $(CYGPATH_W) 'world_entities/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/player.cc'; fi`
    565 
    566 orxonox-npc.o: world_entities/npc.cc
    567 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc.o -MD -MP -MF "$(DEPDIR)/orxonox-npc.Tpo" -c -o orxonox-npc.o `test -f 'world_entities/npc.cc' || echo '$(srcdir)/'`world_entities/npc.cc; \
    568 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
    569 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.o' libtool=no @AMDEPBACKSLASH@
    570 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc.Po' tmpdepfile='$(DEPDIR)/orxonox-npc.TPo' @AMDEPBACKSLASH@
    571 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    572 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.o `test -f 'world_entities/npc.cc' || echo '$(srcdir)/'`world_entities/npc.cc
    573 
    574 orxonox-npc.obj: world_entities/npc.cc
    575 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc.Tpo" -c -o orxonox-npc.obj `if test -f 'world_entities/npc.cc'; then $(CYGPATH_W) 'world_entities/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc.cc'; fi`; \
    576 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
    577 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.obj' libtool=no @AMDEPBACKSLASH@
    578 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc.Po' tmpdepfile='$(DEPDIR)/orxonox-npc.TPo' @AMDEPBACKSLASH@
    579 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    580 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.obj `if test -f 'world_entities/npc.cc'; then $(CYGPATH_W) 'world_entities/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc.cc'; fi`
    581 
    582 orxonox-npc2.o: world_entities/npc2.cc
    583 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc2.o -MD -MP -MF "$(DEPDIR)/orxonox-npc2.Tpo" -c -o orxonox-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc; \
    584 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi
    585 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc2.cc' object='orxonox-npc2.o' libtool=no @AMDEPBACKSLASH@
    586 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc2.Po' tmpdepfile='$(DEPDIR)/orxonox-npc2.TPo' @AMDEPBACKSLASH@
    587 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    588 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc
    589 
    590 orxonox-npc2.obj: world_entities/npc2.cc
    591 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc2.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc2.Tpo" -c -o orxonox-npc2.obj `if test -f 'world_entities/npc2.cc'; then $(CYGPATH_W) 'world_entities/npc2.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc2.cc'; fi`; \
    592 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi
    593 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc2.cc' object='orxonox-npc2.obj' libtool=no @AMDEPBACKSLASH@
    594 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc2.Po' tmpdepfile='$(DEPDIR)/orxonox-npc2.TPo' @AMDEPBACKSLASH@
    595 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    596 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc2.obj `if test -f 'world_entities/npc2.cc'; then $(CYGPATH_W) 'world_entities/npc2.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc2.cc'; fi`
    597 
    598 orxonox-environment.o: world_entities/environment.cc
    599 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-environment.o -MD -MP -MF "$(DEPDIR)/orxonox-environment.Tpo" -c -o orxonox-environment.o `test -f 'world_entities/environment.cc' || echo '$(srcdir)/'`world_entities/environment.cc; \
    600 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-environment.Tpo" "$(DEPDIR)/orxonox-environment.Po"; else rm -f "$(DEPDIR)/orxonox-environment.Tpo"; exit 1; fi
    601 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/environment.cc' object='orxonox-environment.o' libtool=no @AMDEPBACKSLASH@
    602 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-environment.Po' tmpdepfile='$(DEPDIR)/orxonox-environment.TPo' @AMDEPBACKSLASH@
    603 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    604 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-environment.o `test -f 'world_entities/environment.cc' || echo '$(srcdir)/'`world_entities/environment.cc
    605 
    606 orxonox-environment.obj: world_entities/environment.cc
    607 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-environment.obj -MD -MP -MF "$(DEPDIR)/orxonox-environment.Tpo" -c -o orxonox-environment.obj `if test -f 'world_entities/environment.cc'; then $(CYGPATH_W) 'world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/environment.cc'; fi`; \
    608 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-environment.Tpo" "$(DEPDIR)/orxonox-environment.Po"; else rm -f "$(DEPDIR)/orxonox-environment.Tpo"; exit 1; fi
    609 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/environment.cc' object='orxonox-environment.obj' libtool=no @AMDEPBACKSLASH@
    610 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-environment.Po' tmpdepfile='$(DEPDIR)/orxonox-environment.TPo' @AMDEPBACKSLASH@
    611 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    612 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-environment.obj `if test -f 'world_entities/environment.cc'; then $(CYGPATH_W) 'world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/environment.cc'; fi`
    613 
    614 orxonox-skysphere.o: world_entities/skysphere.cc
    615 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-skysphere.o -MD -MP -MF "$(DEPDIR)/orxonox-skysphere.Tpo" -c -o orxonox-skysphere.o `test -f 'world_entities/skysphere.cc' || echo '$(srcdir)/'`world_entities/skysphere.cc; \
    616 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skysphere.Tpo" "$(DEPDIR)/orxonox-skysphere.Po"; else rm -f "$(DEPDIR)/orxonox-skysphere.Tpo"; exit 1; fi
    617 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='orxonox-skysphere.o' libtool=no @AMDEPBACKSLASH@
    618 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skysphere.Po' tmpdepfile='$(DEPDIR)/orxonox-skysphere.TPo' @AMDEPBACKSLASH@
    619 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    620 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-skysphere.o `test -f 'world_entities/skysphere.cc' || echo '$(srcdir)/'`world_entities/skysphere.cc
    621 
    622 orxonox-skysphere.obj: world_entities/skysphere.cc
    623 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-skysphere.obj -MD -MP -MF "$(DEPDIR)/orxonox-skysphere.Tpo" -c -o orxonox-skysphere.obj `if test -f 'world_entities/skysphere.cc'; then $(CYGPATH_W) 'world_entities/skysphere.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skysphere.cc'; fi`; \
    624 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skysphere.Tpo" "$(DEPDIR)/orxonox-skysphere.Po"; else rm -f "$(DEPDIR)/orxonox-skysphere.Tpo"; exit 1; fi
    625 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='orxonox-skysphere.obj' libtool=no @AMDEPBACKSLASH@
    626 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skysphere.Po' tmpdepfile='$(DEPDIR)/orxonox-skysphere.TPo' @AMDEPBACKSLASH@
    627 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    628 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-skysphere.obj `if test -f 'world_entities/skysphere.cc'; then $(CYGPATH_W) 'world_entities/skysphere.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skysphere.cc'; fi`
    629 
    630 orxonox-skybox.o: world_entities/skybox.cc
    631 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-skybox.o -MD -MP -MF "$(DEPDIR)/orxonox-skybox.Tpo" -c -o orxonox-skybox.o `test -f 'world_entities/skybox.cc' || echo '$(srcdir)/'`world_entities/skybox.cc; \
    632 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skybox.Tpo" "$(DEPDIR)/orxonox-skybox.Po"; else rm -f "$(DEPDIR)/orxonox-skybox.Tpo"; exit 1; fi
    633 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skybox.cc' object='orxonox-skybox.o' libtool=no @AMDEPBACKSLASH@
    634 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skybox.Po' tmpdepfile='$(DEPDIR)/orxonox-skybox.TPo' @AMDEPBACKSLASH@
    635 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    636 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-skybox.o `test -f 'world_entities/skybox.cc' || echo '$(srcdir)/'`world_entities/skybox.cc
    637 
    638 orxonox-skybox.obj: world_entities/skybox.cc
    639 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-skybox.obj -MD -MP -MF "$(DEPDIR)/orxonox-skybox.Tpo" -c -o orxonox-skybox.obj `if test -f 'world_entities/skybox.cc'; then $(CYGPATH_W) 'world_entities/skybox.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skybox.cc'; fi`; \
    640 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skybox.Tpo" "$(DEPDIR)/orxonox-skybox.Po"; else rm -f "$(DEPDIR)/orxonox-skybox.Tpo"; exit 1; fi
    641 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skybox.cc' object='orxonox-skybox.obj' libtool=no @AMDEPBACKSLASH@
    642 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skybox.Po' tmpdepfile='$(DEPDIR)/orxonox-skybox.TPo' @AMDEPBACKSLASH@
    643 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    644 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-skybox.obj `if test -f 'world_entities/skybox.cc'; then $(CYGPATH_W) 'world_entities/skybox.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skybox.cc'; fi`
    645 
    646 orxonox-terrain.o: world_entities/terrain.cc
    647 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-terrain.o -MD -MP -MF "$(DEPDIR)/orxonox-terrain.Tpo" -c -o orxonox-terrain.o `test -f 'world_entities/terrain.cc' || echo '$(srcdir)/'`world_entities/terrain.cc; \
    648 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-terrain.Tpo" "$(DEPDIR)/orxonox-terrain.Po"; else rm -f "$(DEPDIR)/orxonox-terrain.Tpo"; exit 1; fi
    649 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='orxonox-terrain.o' libtool=no @AMDEPBACKSLASH@
    650 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-terrain.Po' tmpdepfile='$(DEPDIR)/orxonox-terrain.TPo' @AMDEPBACKSLASH@
    651 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    652 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-terrain.o `test -f 'world_entities/terrain.cc' || echo '$(srcdir)/'`world_entities/terrain.cc
    653 
    654 orxonox-terrain.obj: world_entities/terrain.cc
    655 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-terrain.obj -MD -MP -MF "$(DEPDIR)/orxonox-terrain.Tpo" -c -o orxonox-terrain.obj `if test -f 'world_entities/terrain.cc'; then $(CYGPATH_W) 'world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/terrain.cc'; fi`; \
    656 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-terrain.Tpo" "$(DEPDIR)/orxonox-terrain.Po"; else rm -f "$(DEPDIR)/orxonox-terrain.Tpo"; exit 1; fi
    657 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='orxonox-terrain.obj' libtool=no @AMDEPBACKSLASH@
    658 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-terrain.Po' tmpdepfile='$(DEPDIR)/orxonox-terrain.TPo' @AMDEPBACKSLASH@
    659 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    660 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-terrain.obj `if test -f 'world_entities/terrain.cc'; then $(CYGPATH_W) 'world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/terrain.cc'; fi`
    661 
    662 orxonox-satellite.o: world_entities/satellite.cc
    663 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-satellite.o -MD -MP -MF "$(DEPDIR)/orxonox-satellite.Tpo" -c -o orxonox-satellite.o `test -f 'world_entities/satellite.cc' || echo '$(srcdir)/'`world_entities/satellite.cc; \
    664 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-satellite.Tpo" "$(DEPDIR)/orxonox-satellite.Po"; else rm -f "$(DEPDIR)/orxonox-satellite.Tpo"; exit 1; fi
    665 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='orxonox-satellite.o' libtool=no @AMDEPBACKSLASH@
    666 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-satellite.Po' tmpdepfile='$(DEPDIR)/orxonox-satellite.TPo' @AMDEPBACKSLASH@
    667 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    668 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-satellite.o `test -f 'world_entities/satellite.cc' || echo '$(srcdir)/'`world_entities/satellite.cc
    669 
    670 orxonox-satellite.obj: world_entities/satellite.cc
    671 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-satellite.obj -MD -MP -MF "$(DEPDIR)/orxonox-satellite.Tpo" -c -o orxonox-satellite.obj `if test -f 'world_entities/satellite.cc'; then $(CYGPATH_W) 'world_entities/satellite.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/satellite.cc'; fi`; \
    672 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-satellite.Tpo" "$(DEPDIR)/orxonox-satellite.Po"; else rm -f "$(DEPDIR)/orxonox-satellite.Tpo"; exit 1; fi
    673 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='orxonox-satellite.obj' libtool=no @AMDEPBACKSLASH@
    674 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-satellite.Po' tmpdepfile='$(DEPDIR)/orxonox-satellite.TPo' @AMDEPBACKSLASH@
    675 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    676 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-satellite.obj `if test -f 'world_entities/satellite.cc'; then $(CYGPATH_W) 'world_entities/satellite.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/satellite.cc'; fi`
    677 
    678 orxonox-character_attributes.o: world_entities/character_attributes.cc
    679 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-character_attributes.o -MD -MP -MF "$(DEPDIR)/orxonox-character_attributes.Tpo" -c -o orxonox-character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc; \
    680 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-character_attributes.Tpo" "$(DEPDIR)/orxonox-character_attributes.Po"; else rm -f "$(DEPDIR)/orxonox-character_attributes.Tpo"; exit 1; fi
    681 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='orxonox-character_attributes.o' libtool=no @AMDEPBACKSLASH@
    682 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-character_attributes.Po' tmpdepfile='$(DEPDIR)/orxonox-character_attributes.TPo' @AMDEPBACKSLASH@
    683 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    684 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc
    685 
    686 orxonox-character_attributes.obj: world_entities/character_attributes.cc
    687 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-character_attributes.obj -MD -MP -MF "$(DEPDIR)/orxonox-character_attributes.Tpo" -c -o orxonox-character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`; \
    688 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-character_attributes.Tpo" "$(DEPDIR)/orxonox-character_attributes.Po"; else rm -f "$(DEPDIR)/orxonox-character_attributes.Tpo"; exit 1; fi
    689 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='orxonox-character_attributes.obj' libtool=no @AMDEPBACKSLASH@
    690 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-character_attributes.Po' tmpdepfile='$(DEPDIR)/orxonox-character_attributes.TPo' @AMDEPBACKSLASH@
    691 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    692 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`
    693 
    694 orxonox-test_entity.o: world_entities/test_entity.cc
    695 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-test_entity.o -MD -MP -MF "$(DEPDIR)/orxonox-test_entity.Tpo" -c -o orxonox-test_entity.o `test -f 'world_entities/test_entity.cc' || echo '$(srcdir)/'`world_entities/test_entity.cc; \
    696 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-test_entity.Tpo" "$(DEPDIR)/orxonox-test_entity.Po"; else rm -f "$(DEPDIR)/orxonox-test_entity.Tpo"; exit 1; fi
    697 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_entity.cc' object='orxonox-test_entity.o' libtool=no @AMDEPBACKSLASH@
    698 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-test_entity.TPo' @AMDEPBACKSLASH@
    699 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    700 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_entity.o `test -f 'world_entities/test_entity.cc' || echo '$(srcdir)/'`world_entities/test_entity.cc
    701 
    702 orxonox-test_entity.obj: world_entities/test_entity.cc
    703 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-test_entity.obj -MD -MP -MF "$(DEPDIR)/orxonox-test_entity.Tpo" -c -o orxonox-test_entity.obj `if test -f 'world_entities/test_entity.cc'; then $(CYGPATH_W) 'world_entities/test_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_entity.cc'; fi`; \
    704 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-test_entity.Tpo" "$(DEPDIR)/orxonox-test_entity.Po"; else rm -f "$(DEPDIR)/orxonox-test_entity.Tpo"; exit 1; fi
    705 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_entity.cc' object='orxonox-test_entity.obj' libtool=no @AMDEPBACKSLASH@
    706 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-test_entity.TPo' @AMDEPBACKSLASH@
    707 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    708 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_entity.obj `if test -f 'world_entities/test_entity.cc'; then $(CYGPATH_W) 'world_entities/test_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_entity.cc'; fi`
    709 
    710 orxonox-weapon_manager.o: world_entities/weapons/weapon_manager.cc
    711 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-weapon_manager.o -MD -MP -MF "$(DEPDIR)/orxonox-weapon_manager.Tpo" -c -o orxonox-weapon_manager.o `test -f 'world_entities/weapons/weapon_manager.cc' || echo '$(srcdir)/'`world_entities/weapons/weapon_manager.cc; \
    712 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon_manager.Tpo" "$(DEPDIR)/orxonox-weapon_manager.Po"; else rm -f "$(DEPDIR)/orxonox-weapon_manager.Tpo"; exit 1; fi
    713 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon_manager.cc' object='orxonox-weapon_manager.o' libtool=no @AMDEPBACKSLASH@
    714 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon_manager.TPo' @AMDEPBACKSLASH@
    715 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    716 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon_manager.o `test -f 'world_entities/weapons/weapon_manager.cc' || echo '$(srcdir)/'`world_entities/weapons/weapon_manager.cc
    717 
    718 orxonox-weapon_manager.obj: world_entities/weapons/weapon_manager.cc
    719 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-weapon_manager.obj -MD -MP -MF "$(DEPDIR)/orxonox-weapon_manager.Tpo" -c -o orxonox-weapon_manager.obj `if test -f 'world_entities/weapons/weapon_manager.cc'; then $(CYGPATH_W) 'world_entities/weapons/weapon_manager.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/weapon_manager.cc'; fi`; \
    720 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon_manager.Tpo" "$(DEPDIR)/orxonox-weapon_manager.Po"; else rm -f "$(DEPDIR)/orxonox-weapon_manager.Tpo"; exit 1; fi
    721 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon_manager.cc' object='orxonox-weapon_manager.obj' libtool=no @AMDEPBACKSLASH@
    722 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon_manager.TPo' @AMDEPBACKSLASH@
    723 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    724 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon_manager.obj `if test -f 'world_entities/weapons/weapon_manager.cc'; then $(CYGPATH_W) 'world_entities/weapons/weapon_manager.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/weapon_manager.cc'; fi`
    725 
    726 orxonox-weapon.o: world_entities/weapons/weapon.cc
    727 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-weapon.o -MD -MP -MF "$(DEPDIR)/orxonox-weapon.Tpo" -c -o orxonox-weapon.o `test -f 'world_entities/weapons/weapon.cc' || echo '$(srcdir)/'`world_entities/weapons/weapon.cc; \
    728 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
    729 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon.cc' object='orxonox-weapon.o' libtool=no @AMDEPBACKSLASH@
    730 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
    731 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    732 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon.o `test -f 'world_entities/weapons/weapon.cc' || echo '$(srcdir)/'`world_entities/weapons/weapon.cc
    733 
    734 orxonox-weapon.obj: world_entities/weapons/weapon.cc
    735 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-weapon.obj -MD -MP -MF "$(DEPDIR)/orxonox-weapon.Tpo" -c -o orxonox-weapon.obj `if test -f 'world_entities/weapons/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapons/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/weapon.cc'; fi`; \
    736 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
    737 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon.cc' object='orxonox-weapon.obj' libtool=no @AMDEPBACKSLASH@
    738 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
    739 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    740 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon.obj `if test -f 'world_entities/weapons/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapons/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/weapon.cc'; fi`
    741 
    742 orxonox-projectile.o: world_entities/weapons/projectile.cc
    743 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-projectile.o -MD -MP -MF "$(DEPDIR)/orxonox-projectile.Tpo" -c -o orxonox-projectile.o `test -f 'world_entities/weapons/projectile.cc' || echo '$(srcdir)/'`world_entities/weapons/projectile.cc; \
    744 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
    745 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/projectile.cc' object='orxonox-projectile.o' libtool=no @AMDEPBACKSLASH@
    746 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
    747 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    748 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-projectile.o `test -f 'world_entities/weapons/projectile.cc' || echo '$(srcdir)/'`world_entities/weapons/projectile.cc
    749 
    750 orxonox-projectile.obj: world_entities/weapons/projectile.cc
    751 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-projectile.obj -MD -MP -MF "$(DEPDIR)/orxonox-projectile.Tpo" -c -o orxonox-projectile.obj `if test -f 'world_entities/weapons/projectile.cc'; then $(CYGPATH_W) 'world_entities/weapons/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/projectile.cc'; fi`; \
    752 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
    753 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/projectile.cc' object='orxonox-projectile.obj' libtool=no @AMDEPBACKSLASH@
    754 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
    755 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    756 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-projectile.obj `if test -f 'world_entities/weapons/projectile.cc'; then $(CYGPATH_W) 'world_entities/weapons/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/projectile.cc'; fi`
    757 
    758 orxonox-test_gun.o: world_entities/weapons/test_gun.cc
    759 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-test_gun.o -MD -MP -MF "$(DEPDIR)/orxonox-test_gun.Tpo" -c -o orxonox-test_gun.o `test -f 'world_entities/weapons/test_gun.cc' || echo '$(srcdir)/'`world_entities/weapons/test_gun.cc; \
    760 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-test_gun.Tpo" "$(DEPDIR)/orxonox-test_gun.Po"; else rm -f "$(DEPDIR)/orxonox-test_gun.Tpo"; exit 1; fi
    761 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_gun.cc' object='orxonox-test_gun.o' libtool=no @AMDEPBACKSLASH@
    762 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
    763 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    764 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_gun.o `test -f 'world_entities/weapons/test_gun.cc' || echo '$(srcdir)/'`world_entities/weapons/test_gun.cc
    765 
    766 orxonox-test_gun.obj: world_entities/weapons/test_gun.cc
    767 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-test_gun.obj -MD -MP -MF "$(DEPDIR)/orxonox-test_gun.Tpo" -c -o orxonox-test_gun.obj `if test -f 'world_entities/weapons/test_gun.cc'; then $(CYGPATH_W) 'world_entities/weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/test_gun.cc'; fi`; \
    768 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-test_gun.Tpo" "$(DEPDIR)/orxonox-test_gun.Po"; else rm -f "$(DEPDIR)/orxonox-test_gun.Tpo"; exit 1; fi
    769 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_gun.cc' object='orxonox-test_gun.obj' libtool=no @AMDEPBACKSLASH@
    770 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
    771 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    772 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_gun.obj `if test -f 'world_entities/weapons/test_gun.cc'; then $(CYGPATH_W) 'world_entities/weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/test_gun.cc'; fi`
    773 
    774 orxonox-turret.o: world_entities/weapons/turret.cc
    775 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-turret.o -MD -MP -MF "$(DEPDIR)/orxonox-turret.Tpo" -c -o orxonox-turret.o `test -f 'world_entities/weapons/turret.cc' || echo '$(srcdir)/'`world_entities/weapons/turret.cc; \
    776 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-turret.Tpo" "$(DEPDIR)/orxonox-turret.Po"; else rm -f "$(DEPDIR)/orxonox-turret.Tpo"; exit 1; fi
    777 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/turret.cc' object='orxonox-turret.o' libtool=no @AMDEPBACKSLASH@
    778 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret.Po' tmpdepfile='$(DEPDIR)/orxonox-turret.TPo' @AMDEPBACKSLASH@
    779 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    780 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret.o `test -f 'world_entities/weapons/turret.cc' || echo '$(srcdir)/'`world_entities/weapons/turret.cc
    781 
    782 orxonox-turret.obj: world_entities/weapons/turret.cc
    783 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-turret.obj -MD -MP -MF "$(DEPDIR)/orxonox-turret.Tpo" -c -o orxonox-turret.obj `if test -f 'world_entities/weapons/turret.cc'; then $(CYGPATH_W) 'world_entities/weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/turret.cc'; fi`; \
    784 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-turret.Tpo" "$(DEPDIR)/orxonox-turret.Po"; else rm -f "$(DEPDIR)/orxonox-turret.Tpo"; exit 1; fi
    785 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/turret.cc' object='orxonox-turret.obj' libtool=no @AMDEPBACKSLASH@
    786 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret.Po' tmpdepfile='$(DEPDIR)/orxonox-turret.TPo' @AMDEPBACKSLASH@
    787 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    788 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret.obj `if test -f 'world_entities/weapons/turret.cc'; then $(CYGPATH_W) 'world_entities/weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/turret.cc'; fi`
    789 
    790 orxonox-test_bullet.o: world_entities/weapons/test_bullet.cc
    791 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-test_bullet.o -MD -MP -MF "$(DEPDIR)/orxonox-test_bullet.Tpo" -c -o orxonox-test_bullet.o `test -f 'world_entities/weapons/test_bullet.cc' || echo '$(srcdir)/'`world_entities/weapons/test_bullet.cc; \
    792 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-test_bullet.Tpo" "$(DEPDIR)/orxonox-test_bullet.Po"; else rm -f "$(DEPDIR)/orxonox-test_bullet.Tpo"; exit 1; fi
    793 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_bullet.cc' object='orxonox-test_bullet.o' libtool=no @AMDEPBACKSLASH@
    794 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
    795 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    796 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_bullet.o `test -f 'world_entities/weapons/test_bullet.cc' || echo '$(srcdir)/'`world_entities/weapons/test_bullet.cc
    797 
    798 orxonox-test_bullet.obj: world_entities/weapons/test_bullet.cc
    799 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-test_bullet.obj -MD -MP -MF "$(DEPDIR)/orxonox-test_bullet.Tpo" -c -o orxonox-test_bullet.obj `if test -f 'world_entities/weapons/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/weapons/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/test_bullet.cc'; fi`; \
    800 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-test_bullet.Tpo" "$(DEPDIR)/orxonox-test_bullet.Po"; else rm -f "$(DEPDIR)/orxonox-test_bullet.Tpo"; exit 1; fi
    801 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_bullet.cc' object='orxonox-test_bullet.obj' libtool=no @AMDEPBACKSLASH@
    802 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
    803 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    804 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_bullet.obj `if test -f 'world_entities/weapons/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/weapons/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/test_bullet.cc'; fi`
    805 
    806 orxonox-crosshair.o: world_entities/weapons/crosshair.cc
    807 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-crosshair.o -MD -MP -MF "$(DEPDIR)/orxonox-crosshair.Tpo" -c -o orxonox-crosshair.o `test -f 'world_entities/weapons/crosshair.cc' || echo '$(srcdir)/'`world_entities/weapons/crosshair.cc; \
    808 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-crosshair.Tpo" "$(DEPDIR)/orxonox-crosshair.Po"; else rm -f "$(DEPDIR)/orxonox-crosshair.Tpo"; exit 1; fi
    809 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/crosshair.cc' object='orxonox-crosshair.o' libtool=no @AMDEPBACKSLASH@
    810 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-crosshair.Po' tmpdepfile='$(DEPDIR)/orxonox-crosshair.TPo' @AMDEPBACKSLASH@
    811 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    812 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-crosshair.o `test -f 'world_entities/weapons/crosshair.cc' || echo '$(srcdir)/'`world_entities/weapons/crosshair.cc
    813 
    814 orxonox-crosshair.obj: world_entities/weapons/crosshair.cc
    815 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-crosshair.obj -MD -MP -MF "$(DEPDIR)/orxonox-crosshair.Tpo" -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 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-crosshair.Tpo" "$(DEPDIR)/orxonox-crosshair.Po"; else rm -f "$(DEPDIR)/orxonox-crosshair.Tpo"; exit 1; fi
    817 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/crosshair.cc' object='orxonox-crosshair.obj' libtool=no @AMDEPBACKSLASH@
    818 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-crosshair.Po' tmpdepfile='$(DEPDIR)/orxonox-crosshair.TPo' @AMDEPBACKSLASH@
    819 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    820 @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`
    821 
    822 orxonox-power_up.o: world_entities/power_ups/power_up.cc
    823 @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; \
    824 @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
    825 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.o' libtool=no @AMDEPBACKSLASH@
    826 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
    827 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    828 @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
    829 
    830 orxonox-power_up.obj: world_entities/power_ups/power_up.cc
    831 @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`; \
    832 @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
    833 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.obj' libtool=no @AMDEPBACKSLASH@
    834 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
    835 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    836 @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`
    837 
    838 orxonox-turret_power_up.o: world_entities/power_ups/turret_power_up.cc
    839 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-turret_power_up.o -MD -MP -MF "$(DEPDIR)/orxonox-turret_power_up.Tpo" -c -o orxonox-turret_power_up.o `test -f 'world_entities/power_ups/turret_power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/turret_power_up.cc; \
    840 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-turret_power_up.Tpo" "$(DEPDIR)/orxonox-turret_power_up.Po"; else rm -f "$(DEPDIR)/orxonox-turret_power_up.Tpo"; exit 1; fi
    841 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/turret_power_up.cc' object='orxonox-turret_power_up.o' libtool=no @AMDEPBACKSLASH@
    842 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret_power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-turret_power_up.TPo' @AMDEPBACKSLASH@
    843 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    844 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret_power_up.o `test -f 'world_entities/power_ups/turret_power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/turret_power_up.cc
    845 
    846 orxonox-turret_power_up.obj: world_entities/power_ups/turret_power_up.cc
    847 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-turret_power_up.obj -MD -MP -MF "$(DEPDIR)/orxonox-turret_power_up.Tpo" -c -o orxonox-turret_power_up.obj `if test -f 'world_entities/power_ups/turret_power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/turret_power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/turret_power_up.cc'; fi`; \
    848 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-turret_power_up.Tpo" "$(DEPDIR)/orxonox-turret_power_up.Po"; else rm -f "$(DEPDIR)/orxonox-turret_power_up.Tpo"; exit 1; fi
    849 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/turret_power_up.cc' object='orxonox-turret_power_up.obj' libtool=no @AMDEPBACKSLASH@
    850 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret_power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-turret_power_up.TPo' @AMDEPBACKSLASH@
    851 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    852 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret_power_up.obj `if test -f 'world_entities/power_ups/turret_power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/turret_power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/turret_power_up.cc'; fi`
     449orxonox-world.lo: story_entities/world.cc
     450@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-world.lo -MD -MP -MF "$(DEPDIR)/orxonox-world.Tpo" -c -o orxonox-world.lo `test -f 'story_entities/world.cc' || echo '$(srcdir)/'`story_entities/world.cc; \
     451@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-world.Tpo" "$(DEPDIR)/orxonox-world.Plo"; else rm -f "$(DEPDIR)/orxonox-world.Tpo"; exit 1; fi
     452@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/world.cc' object='orxonox-world.lo' libtool=yes @AMDEPBACKSLASH@
     453@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-world.Plo' tmpdepfile='$(DEPDIR)/orxonox-world.TPlo' @AMDEPBACKSLASH@
     454@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     455@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-world.lo `test -f 'story_entities/world.cc' || echo '$(srcdir)/'`story_entities/world.cc
    853456
    854457orxonox-benchmark.o: subprojects/benchmark.cc
     
    867470@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    868471@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-benchmark.obj `if test -f 'subprojects/benchmark.cc'; then $(CYGPATH_W) 'subprojects/benchmark.cc'; else $(CYGPATH_W) '$(srcdir)/subprojects/benchmark.cc'; fi`
     472
     473orxonox-benchmark.lo: subprojects/benchmark.cc
     474@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-benchmark.lo -MD -MP -MF "$(DEPDIR)/orxonox-benchmark.Tpo" -c -o orxonox-benchmark.lo `test -f 'subprojects/benchmark.cc' || echo '$(srcdir)/'`subprojects/benchmark.cc; \
     475@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-benchmark.Tpo" "$(DEPDIR)/orxonox-benchmark.Plo"; else rm -f "$(DEPDIR)/orxonox-benchmark.Tpo"; exit 1; fi
     476@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='subprojects/benchmark.cc' object='orxonox-benchmark.lo' libtool=yes @AMDEPBACKSLASH@
     477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-benchmark.Plo' tmpdepfile='$(DEPDIR)/orxonox-benchmark.TPlo' @AMDEPBACKSLASH@
     478@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     479@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-benchmark.lo `test -f 'subprojects/benchmark.cc' || echo '$(srcdir)/'`subprojects/benchmark.cc
     480
     481mostlyclean-libtool:
     482        -rm -f *.lo
     483
     484clean-libtool:
     485        -rm -rf .libs _libs
     486
     487distclean-libtool:
     488        -rm -f libtool
    869489uninstall-info-am:
    870490
     
    990610
    991611distdir: $(DISTFILES)
    992         $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
     612        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects
    993613        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    994614        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    1064684clean: clean-recursive
    1065685
    1066 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
     686clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
    1067687
    1068688distclean: distclean-recursive
     
    1070690        -rm -f Makefile
    1071691distclean-am: clean-am distclean-compile distclean-generic \
    1072         distclean-tags
     692        distclean-libtool distclean-tags
    1073693
    1074694dvi: dvi-recursive
     
    1099719mostlyclean: mostlyclean-recursive
    1100720
    1101 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     721mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     722        mostlyclean-libtool
    1102723
    1103724pdf: pdf-recursive
     
    1114735
    1115736.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1116         clean clean-binPROGRAMS clean-generic clean-recursive ctags \
    1117         ctags-recursive distclean distclean-compile distclean-generic \
     737        clean clean-binPROGRAMS clean-generic clean-libtool \
     738        clean-recursive ctags ctags-recursive distclean \
     739        distclean-compile distclean-generic distclean-libtool \
    1118740        distclean-recursive distclean-tags distdir dvi dvi-am html \
    1119741        html-am info info-am install install-am install-binPROGRAMS \
     
    1123745        maintainer-clean maintainer-clean-generic \
    1124746        maintainer-clean-recursive mostlyclean mostlyclean-compile \
    1125         mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
    1126         tags tags-recursive uninstall uninstall-am \
     747        mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
     748        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
    1127749        uninstall-binPROGRAMS uninstall-info-am
    1128750
  • trunk/src/defs/class_id.h

    r5445 r5456  
    128128  CL_SKYSPHERE                  =    0x00000206,
    129129  CL_TERRAIN                    =    0x00000207,
    130   CL_TEST_BULLET                =    0x00000208,
    131130  CL_TEST_ENTITY                =    0x00000209,
    132   CL_TEST_GUN                   =    0x0000020a,
    133   CL_TURRET                     =    0x0000020b,
    134 
    135   CL_TURRET_POWER_UP            =    0x0000020b,
     131
     132  CL_TURRET_POWER_UP            =    0x00000211,
     133
     134  CL_TEST_GUN                   =    0x00000230,
     135  CL_TURRET                     =    0x00000231,
     136
     137
     138  CL_TEST_BULLET                =    0x00000240,
     139  CL_ROCKET                     =    0x00000241,
     140  CL_LASER                      =    0x00000242,
    136141
    137142
  • trunk/src/lib/gui/gl_gui/glgui_widget.h

    r5395 r5456  
    4747
    4848    void show();
    49     void hide();
     49    void hide() {};
    5050
    5151    void connectSignal(GLGuiSignalType signalType, Signal* signal);
  • trunk/src/world_entities/Makefile.am

    r5450 r5456  
    1919                  weapons/weapon_manager.cc \
    2020                  weapons/weapon.cc \
    21                   weapons/projectile.cc \
    2221                  weapons/test_gun.cc \
    2322                  weapons/turret.cc \
     23                  weapons/projectile.cc \
    2424                  weapons/test_bullet.cc \
     25                  weapons/rocket.cc \
     26                  weapons/laser.cc \
    2527                  weapons/crosshair.cc \
    2628                  power_ups/power_up.cc \
  • trunk/src/world_entities/Makefile.in

    r5450 r5456  
    5656        player.lo npc.lo npc2.lo environment.lo skysphere.lo skybox.lo \
    5757        terrain.lo satellite.lo character_attributes.lo test_entity.lo \
    58         weapon_manager.lo weapon.lo projectile.lo test_gun.lo \
    59         turret.lo test_bullet.lo crosshair.lo power_up.lo \
    60         turret_power_up.lo
     58        weapon_manager.lo weapon.lo test_gun.lo turret.lo \
     59        projectile.lo test_bullet.lo rocket.lo laser.lo crosshair.lo \
     60        power_up.lo turret_power_up.lo
    6161libORXworld_entities_la_OBJECTS =  \
    6262        $(am_libORXworld_entities_la_OBJECTS)
     
    6767@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Plo \
    6868@AMDEP_TRUE@    ./$(DEPDIR)/crosshair.Plo \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Plo ./$(DEPDIR)/npc.Plo \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/npc2.Plo ./$(DEPDIR)/player.Plo \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/power_up.Plo \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/projectile.Plo \
     69@AMDEP_TRUE@    ./$(DEPDIR)/environment.Plo ./$(DEPDIR)/laser.Plo \
     70@AMDEP_TRUE@    ./$(DEPDIR)/npc.Plo ./$(DEPDIR)/npc2.Plo \
     71@AMDEP_TRUE@    ./$(DEPDIR)/player.Plo ./$(DEPDIR)/power_up.Plo \
     72@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Plo ./$(DEPDIR)/rocket.Plo \
    7373@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Plo ./$(DEPDIR)/skybox.Plo \
    7474@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Plo ./$(DEPDIR)/terrain.Plo \
     
    235235                  weapons/weapon_manager.cc \
    236236                  weapons/weapon.cc \
    237                   weapons/projectile.cc \
    238237                  weapons/test_gun.cc \
    239238                  weapons/turret.cc \
     239                  weapons/projectile.cc \
    240240                  weapons/test_bullet.cc \
     241                  weapons/rocket.cc \
     242                  weapons/laser.cc \
    241243                  weapons/crosshair.cc \
    242244                  power_ups/power_up.cc \
     
    340342@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crosshair.Plo@am__quote@
    341343@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Plo@am__quote@
     344@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laser.Plo@am__quote@
    342345@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/npc.Plo@am__quote@
    343346@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/npc2.Plo@am__quote@
     
    345348@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power_up.Plo@am__quote@
    346349@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Plo@am__quote@
     350@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rocket.Plo@am__quote@
    347351@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/satellite.Plo@am__quote@
    348352@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Plo@am__quote@
     
    430434@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.lo `test -f 'weapons/weapon.cc' || echo '$(srcdir)/'`weapons/weapon.cc
    431435
     436test_gun.o: weapons/test_gun.cc
     437@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.o -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.o `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc; \
     438@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
     439@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
     440@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
     441@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     442@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.o `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc
     443
     444test_gun.obj: weapons/test_gun.cc
     445@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.obj -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.obj `if test -f 'weapons/test_gun.cc'; then $(CYGPATH_W) 'weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/test_gun.cc'; fi`; \
     446@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
     447@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
     448@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
     449@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     450@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.obj `if test -f 'weapons/test_gun.cc'; then $(CYGPATH_W) 'weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/test_gun.cc'; fi`
     451
     452test_gun.lo: weapons/test_gun.cc
     453@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.lo -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.lo `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc; \
     454@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Plo"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
     455@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.lo' libtool=yes @AMDEPBACKSLASH@
     456@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Plo' tmpdepfile='$(DEPDIR)/test_gun.TPlo' @AMDEPBACKSLASH@
     457@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     458@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.lo `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc
     459
     460turret.o: weapons/turret.cc
     461@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.o -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.o `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc; \
     462@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
     463@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.o' libtool=no @AMDEPBACKSLASH@
     464@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
     465@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     466@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.o `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc
     467
     468turret.obj: weapons/turret.cc
     469@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.obj -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.obj `if test -f 'weapons/turret.cc'; then $(CYGPATH_W) 'weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/turret.cc'; fi`; \
     470@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
     471@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.obj' libtool=no @AMDEPBACKSLASH@
     472@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
     473@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     474@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.obj `if test -f 'weapons/turret.cc'; then $(CYGPATH_W) 'weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/turret.cc'; fi`
     475
     476turret.lo: weapons/turret.cc
     477@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.lo -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.lo `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc; \
     478@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Plo"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
     479@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.lo' libtool=yes @AMDEPBACKSLASH@
     480@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Plo' tmpdepfile='$(DEPDIR)/turret.TPlo' @AMDEPBACKSLASH@
     481@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     482@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.lo `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc
     483
    432484projectile.o: weapons/projectile.cc
    433485@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.o -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.o `test -f 'weapons/projectile.cc' || echo '$(srcdir)/'`weapons/projectile.cc; \
     
    454506@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o projectile.lo `test -f 'weapons/projectile.cc' || echo '$(srcdir)/'`weapons/projectile.cc
    455507
    456 test_gun.o: weapons/test_gun.cc
    457 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.o -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.o `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc; \
    458 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
    459 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
    460 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
    461 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    462 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.o `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc
    463 
    464 test_gun.obj: weapons/test_gun.cc
    465 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.obj -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.obj `if test -f 'weapons/test_gun.cc'; then $(CYGPATH_W) 'weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/test_gun.cc'; fi`; \
    466 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
    467 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
    468 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
    469 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    470 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.obj `if test -f 'weapons/test_gun.cc'; then $(CYGPATH_W) 'weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/test_gun.cc'; fi`
    471 
    472 test_gun.lo: weapons/test_gun.cc
    473 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.lo -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.lo `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc; \
    474 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Plo"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
    475 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.lo' libtool=yes @AMDEPBACKSLASH@
    476 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Plo' tmpdepfile='$(DEPDIR)/test_gun.TPlo' @AMDEPBACKSLASH@
    477 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    478 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.lo `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc
    479 
    480 turret.o: weapons/turret.cc
    481 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.o -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.o `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc; \
    482 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
    483 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.o' libtool=no @AMDEPBACKSLASH@
    484 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
    485 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    486 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.o `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc
    487 
    488 turret.obj: weapons/turret.cc
    489 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.obj -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.obj `if test -f 'weapons/turret.cc'; then $(CYGPATH_W) 'weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/turret.cc'; fi`; \
    490 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
    491 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.obj' libtool=no @AMDEPBACKSLASH@
    492 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
    493 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    494 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.obj `if test -f 'weapons/turret.cc'; then $(CYGPATH_W) 'weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/turret.cc'; fi`
    495 
    496 turret.lo: weapons/turret.cc
    497 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.lo -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.lo `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc; \
    498 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Plo"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
    499 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.lo' libtool=yes @AMDEPBACKSLASH@
    500 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Plo' tmpdepfile='$(DEPDIR)/turret.TPlo' @AMDEPBACKSLASH@
    501 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    502 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.lo `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc
    503 
    504508test_bullet.o: weapons/test_bullet.cc
    505509@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_bullet.o -MD -MP -MF "$(DEPDIR)/test_bullet.Tpo" -c -o test_bullet.o `test -f 'weapons/test_bullet.cc' || echo '$(srcdir)/'`weapons/test_bullet.cc; \
     
    525529@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    526530@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.lo `test -f 'weapons/test_bullet.cc' || echo '$(srcdir)/'`weapons/test_bullet.cc
     531
     532rocket.o: weapons/rocket.cc
     533@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rocket.o -MD -MP -MF "$(DEPDIR)/rocket.Tpo" -c -o rocket.o `test -f 'weapons/rocket.cc' || echo '$(srcdir)/'`weapons/rocket.cc; \
     534@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/rocket.Tpo" "$(DEPDIR)/rocket.Po"; else rm -f "$(DEPDIR)/rocket.Tpo"; exit 1; fi
     535@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/rocket.cc' object='rocket.o' libtool=no @AMDEPBACKSLASH@
     536@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/rocket.Po' tmpdepfile='$(DEPDIR)/rocket.TPo' @AMDEPBACKSLASH@
     537@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     538@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rocket.o `test -f 'weapons/rocket.cc' || echo '$(srcdir)/'`weapons/rocket.cc
     539
     540rocket.obj: weapons/rocket.cc
     541@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rocket.obj -MD -MP -MF "$(DEPDIR)/rocket.Tpo" -c -o rocket.obj `if test -f 'weapons/rocket.cc'; then $(CYGPATH_W) 'weapons/rocket.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/rocket.cc'; fi`; \
     542@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/rocket.Tpo" "$(DEPDIR)/rocket.Po"; else rm -f "$(DEPDIR)/rocket.Tpo"; exit 1; fi
     543@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/rocket.cc' object='rocket.obj' libtool=no @AMDEPBACKSLASH@
     544@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/rocket.Po' tmpdepfile='$(DEPDIR)/rocket.TPo' @AMDEPBACKSLASH@
     545@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     546@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rocket.obj `if test -f 'weapons/rocket.cc'; then $(CYGPATH_W) 'weapons/rocket.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/rocket.cc'; fi`
     547
     548rocket.lo: weapons/rocket.cc
     549@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rocket.lo -MD -MP -MF "$(DEPDIR)/rocket.Tpo" -c -o rocket.lo `test -f 'weapons/rocket.cc' || echo '$(srcdir)/'`weapons/rocket.cc; \
     550@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/rocket.Tpo" "$(DEPDIR)/rocket.Plo"; else rm -f "$(DEPDIR)/rocket.Tpo"; exit 1; fi
     551@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/rocket.cc' object='rocket.lo' libtool=yes @AMDEPBACKSLASH@
     552@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/rocket.Plo' tmpdepfile='$(DEPDIR)/rocket.TPlo' @AMDEPBACKSLASH@
     553@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     554@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rocket.lo `test -f 'weapons/rocket.cc' || echo '$(srcdir)/'`weapons/rocket.cc
     555
     556laser.o: weapons/laser.cc
     557@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT laser.o -MD -MP -MF "$(DEPDIR)/laser.Tpo" -c -o laser.o `test -f 'weapons/laser.cc' || echo '$(srcdir)/'`weapons/laser.cc; \
     558@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/laser.Tpo" "$(DEPDIR)/laser.Po"; else rm -f "$(DEPDIR)/laser.Tpo"; exit 1; fi
     559@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/laser.cc' object='laser.o' libtool=no @AMDEPBACKSLASH@
     560@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/laser.Po' tmpdepfile='$(DEPDIR)/laser.TPo' @AMDEPBACKSLASH@
     561@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     562@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o laser.o `test -f 'weapons/laser.cc' || echo '$(srcdir)/'`weapons/laser.cc
     563
     564laser.obj: weapons/laser.cc
     565@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT laser.obj -MD -MP -MF "$(DEPDIR)/laser.Tpo" -c -o laser.obj `if test -f 'weapons/laser.cc'; then $(CYGPATH_W) 'weapons/laser.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/laser.cc'; fi`; \
     566@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/laser.Tpo" "$(DEPDIR)/laser.Po"; else rm -f "$(DEPDIR)/laser.Tpo"; exit 1; fi
     567@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/laser.cc' object='laser.obj' libtool=no @AMDEPBACKSLASH@
     568@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/laser.Po' tmpdepfile='$(DEPDIR)/laser.TPo' @AMDEPBACKSLASH@
     569@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     570@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o laser.obj `if test -f 'weapons/laser.cc'; then $(CYGPATH_W) 'weapons/laser.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/laser.cc'; fi`
     571
     572laser.lo: weapons/laser.cc
     573@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT laser.lo -MD -MP -MF "$(DEPDIR)/laser.Tpo" -c -o laser.lo `test -f 'weapons/laser.cc' || echo '$(srcdir)/'`weapons/laser.cc; \
     574@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/laser.Tpo" "$(DEPDIR)/laser.Plo"; else rm -f "$(DEPDIR)/laser.Tpo"; exit 1; fi
     575@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/laser.cc' object='laser.lo' libtool=yes @AMDEPBACKSLASH@
     576@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/laser.Plo' tmpdepfile='$(DEPDIR)/laser.TPlo' @AMDEPBACKSLASH@
     577@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     578@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o laser.lo `test -f 'weapons/laser.cc' || echo '$(srcdir)/'`weapons/laser.cc
    527579
    528580crosshair.o: weapons/crosshair.cc
  • trunk/src/world_entities/weapons/laser.cc

    r5451 r5456  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1717
    18 #include "test_bullet.h"
     18#include "laser.h"
    1919
    2020#include "fast_factory.h"
     
    3131using namespace std;
    3232
    33 CREATE_FAST_FACTORY_STATIC(TestBullet, CL_TEST_BULLET);
     33CREATE_FAST_FACTORY_STATIC(Laser, CL_LASER);
    3434
    3535/**
    3636 *  standard constructor
    3737*/
    38 TestBullet::TestBullet () : Projectile()
     38Laser::Laser () : Projectile()
    3939{
    40   this->setClassID(CL_TEST_BULLET, "TestBullet");
     40  this->setClassID(CL_TEST_BULLET, "Laser");
    4141
    4242  float modelSize = .3;
    43   this->loadModelWithScale("models/projectiles/orx-rocket.obj", .3);
     43  this->loadModelWithScale("models/projectiles/lasers.obj", .3);
    4444
    4545  this->energyMin = 1;
     
    5151  this->emitter->setParent(this);
    5252  this->emitter->setSpread(M_PI, M_PI);
     53  this->emitter->setEmissionRate(30.0);
     54  this->emitter->setEmissionVelocity(50.0);
    5355}
    5456
     
    5759 *  standard deconstructor
    5860*/
    59 TestBullet::~TestBullet ()
     61Laser::~Laser ()
    6062{
    6163  // delete this->emitter;
    6264
    6365  /* this is normaly done by World.cc by deleting the ParticleEngine */
    64   if (TestBullet::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
     66  if (Laser::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
    6567  {
    66     if (ClassList::exists(TestBullet::trailParticles, CL_PARTICLE_SYSTEM))
    67       delete TestBullet::trailParticles;
    68     TestBullet::trailParticles = NULL;
    69   }
    70   if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
    71   {
    72     if (ClassList::exists(TestBullet::explosionParticles, CL_PARTICLE_SYSTEM))
    73       delete TestBullet::explosionParticles;
    74     TestBullet::explosionParticles = NULL;
     68    if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))
     69      delete Laser::explosionParticles;
     70    Laser::explosionParticles = NULL;
    7571  }
    7672
    7773}
    7874
    79 ParticleSystem* TestBullet::trailParticles = NULL;
    80 ParticleSystem* TestBullet::explosionParticles = NULL;
     75ParticleSystem* Laser::explosionParticles = NULL;
    8176
    82 void TestBullet::activate()
     77void Laser::activate()
    8378{
    8479  State::getWorldEntityList()->add(this);
    85   if (unlikely(TestBullet::trailParticles == NULL))
     80  if (unlikely(Laser::explosionParticles == NULL))
    8681  {
    87     TestBullet::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
    88     TestBullet::trailParticles->setName("TestBulletTrailParticles");
    89     TestBullet::trailParticles->setLifeSpan(.5, .3);
    90     TestBullet::trailParticles->setRadius(0.0, .5);
    91     TestBullet::trailParticles->setRadius(0.5, 2.0);
    92     TestBullet::trailParticles->setRadius(1.0, 5.0);
    93     TestBullet::trailParticles->setColor(0.0, 1,0,0,.7);
    94     TestBullet::trailParticles->setColor(0.5, .8,.8,0,.5);
    95     TestBullet::trailParticles->setColor(1.0, .7,.7,.7,.0);
     82    Laser::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
     83    Laser::explosionParticles->setName("LaserExplosionParticles");
     84    Laser::explosionParticles->setLifeSpan(.5, .3);
     85    Laser::explosionParticles->setRadius(0.0, 10);
     86    Laser::explosionParticles->setRadius(.5, 20.0);
     87    Laser::explosionParticles->setRadius(1.0, 3.0);
     88    Laser::explosionParticles->setColor(0.0, 0,1,0,.9);
     89    Laser::explosionParticles->setColor(0.5, .8,.8,0,.5);
     90    Laser::explosionParticles->setColor(1.0, 1,1,1,.0);
    9691  }
    97   if (unlikely(TestBullet::explosionParticles == NULL))
    98   {
    99     TestBullet::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
    100     TestBullet::explosionParticles->setName("TestBulletExplosionParticles");
    101     TestBullet::explosionParticles->setLifeSpan(.5, .3);
    102     TestBullet::explosionParticles->setRadius(0.0, 10);
    103     TestBullet::explosionParticles->setRadius(.5, 20.0);
    104     TestBullet::explosionParticles->setRadius(1.0, 3.0);
    105     TestBullet::explosionParticles->setColor(0.0, 0,1,0,.9);
    106     TestBullet::explosionParticles->setColor(0.5, .8,.8,0,.5);
    107     TestBullet::explosionParticles->setColor(1.0, 1,1,1,.0);
    108   }
    109 
    110   ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::trailParticles);
    111 
    112   this->emitter->setEmissionRate(20.0);
    113   this->emitter->setEmissionVelocity(3.0);
    11492}
    11593
    11694
    117 void TestBullet::deactivate()
     95void Laser::deactivate()
    11896{
    11997  ParticleEngine::getInstance()->breakConnections(this->emitter);
     
    122100//  GarbageCollector::getInstance()->collect(this);
    123101  State::getWorldEntityList()->remove(this);
    124   TestBullet::fastFactory->kill(this);
     102  Laser::fastFactory->kill(this);
    125103}
    126104
    127105
    128 void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
     106void Laser::collidesWith(WorldEntity* entity, const Vector& location)
    129107{
    130108  if (this->hitEntity != entity && entity->isA(CL_NPC))
     
    137115 * @param time since last tick
    138116*/
    139 void TestBullet::tick (float time)
     117void Laser::tick (float time)
    140118{
    141119  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
     
    157135 *  the function gets called, when the projectile is destroyed
    158136*/
    159 void TestBullet::destroy ()
     137void Laser::destroy ()
    160138{
    161   PRINTF(5)("DESTROY TestBullet\n");
     139  PRINTF(5)("DESTROY Laser\n");
    162140  this->lifeCycle = .95; //!< @todo calculate this usefully.
    163   ParticleEngine::getInstance()->breakConnection(this->emitter, TestBullet::trailParticles);
    164   ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::explosionParticles);
    165 
    166   this->emitter->setEmissionRate(30.0);
    167   this->emitter->setEmissionVelocity(50.0);
    168 //  this->deactivate();
     141  ParticleEngine::getInstance()->addConnection(this->emitter, Laser::explosionParticles);
    169142
    170143}
    171144
    172145
    173 void TestBullet::draw ()
     146void Laser::draw ()
    174147{
    175148  glMatrixMode(GL_MODELVIEW);
  • trunk/src/world_entities/weapons/laser.h

    r5449 r5456  
    11/*!
    2     \projectile.h
    3   * a projectile, that is been shooted by a weapon
     2 * @file laser.h
     3 * @brief a projectile, that is been shooted by a weapon
    44*/
    55
    6 #ifndef _TEST_BULLET_H
    7 #define _TEST_BULLET_H
     6#ifndef _LASER_H
     7#define _LASER_H
    88
    99#include "projectile.h"
     
    1515class FastFactory;
    1616
    17 class TestBullet : public Projectile
     17class Laser : public Projectile
    1818{
    1919  public:
    20     TestBullet ();
    21     virtual ~TestBullet ();
     20    Laser ();
     21    virtual ~Laser ();
    2222
    2323
     
    3535  private:
    3636    static FastFactory*               fastFactory;
    37     static ParticleSystem*            trailParticles;
     37
    3838    static ParticleSystem*            explosionParticles;
    3939
     
    4545};
    4646
    47 #endif /* _TEST_BULLET_H */
     47#endif /* _LASER_H */
  • trunk/src/world_entities/weapons/rocket.cc

    r5451 r5456  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1717
    18 #include "test_bullet.h"
     18#include "rocket.h"
    1919
    2020#include "fast_factory.h"
     
    3131using namespace std;
    3232
    33 CREATE_FAST_FACTORY_STATIC(TestBullet, CL_TEST_BULLET);
     33CREATE_FAST_FACTORY_STATIC(Rocket, CL_ROCKET);
    3434
    3535/**
    3636 *  standard constructor
    3737*/
    38 TestBullet::TestBullet () : Projectile()
     38Rocket::Rocket () : Projectile()
    3939{
    40   this->setClassID(CL_TEST_BULLET, "TestBullet");
     40  this->setClassID(CL_TEST_BULLET, "Rocket");
    4141
    4242  float modelSize = .3;
     
    5757 *  standard deconstructor
    5858*/
    59 TestBullet::~TestBullet ()
     59Rocket::~Rocket ()
    6060{
    6161  // delete this->emitter;
    6262
    6363  /* this is normaly done by World.cc by deleting the ParticleEngine */
    64   if (TestBullet::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
     64  if (Rocket::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
    6565  {
    66     if (ClassList::exists(TestBullet::trailParticles, CL_PARTICLE_SYSTEM))
    67       delete TestBullet::trailParticles;
    68     TestBullet::trailParticles = NULL;
     66    if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
     67      delete Rocket::trailParticles;
     68    Rocket::trailParticles = NULL;
    6969  }
    70   if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
     70  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
    7171  {
    72     if (ClassList::exists(TestBullet::explosionParticles, CL_PARTICLE_SYSTEM))
    73       delete TestBullet::explosionParticles;
    74     TestBullet::explosionParticles = NULL;
     72    if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))
     73      delete Rocket::explosionParticles;
     74    Rocket::explosionParticles = NULL;
    7575  }
    7676
    7777}
    7878
    79 ParticleSystem* TestBullet::trailParticles = NULL;
    80 ParticleSystem* TestBullet::explosionParticles = NULL;
     79ParticleSystem* Rocket::trailParticles = NULL;
     80ParticleSystem* Rocket::explosionParticles = NULL;
    8181
    82 void TestBullet::activate()
     82void Rocket::activate()
    8383{
    8484  State::getWorldEntityList()->add(this);
    85   if (unlikely(TestBullet::trailParticles == NULL))
     85  if (unlikely(Rocket::trailParticles == NULL))
    8686  {
    87     TestBullet::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
    88     TestBullet::trailParticles->setName("TestBulletTrailParticles");
    89     TestBullet::trailParticles->setLifeSpan(.5, .3);
    90     TestBullet::trailParticles->setRadius(0.0, .5);
    91     TestBullet::trailParticles->setRadius(0.5, 2.0);
    92     TestBullet::trailParticles->setRadius(1.0, 5.0);
    93     TestBullet::trailParticles->setColor(0.0, 1,0,0,.7);
    94     TestBullet::trailParticles->setColor(0.5, .8,.8,0,.5);
    95     TestBullet::trailParticles->setColor(1.0, .7,.7,.7,.0);
     87    Rocket::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
     88    Rocket::trailParticles->setName("RocketTrailParticles");
     89    Rocket::trailParticles->setLifeSpan(.5, .3);
     90    Rocket::trailParticles->setRadius(0.0, .5);
     91    Rocket::trailParticles->setRadius(0.5, 2.0);
     92    Rocket::trailParticles->setRadius(1.0, 5.0);
     93    Rocket::trailParticles->setColor(0.0, 1,0,0,.7);
     94    Rocket::trailParticles->setColor(0.5, .8,.8,0,.5);
     95    Rocket::trailParticles->setColor(1.0, .7,.7,.7,.0);
    9696  }
    97   if (unlikely(TestBullet::explosionParticles == NULL))
     97  if (unlikely(Rocket::explosionParticles == NULL))
    9898  {
    99     TestBullet::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
    100     TestBullet::explosionParticles->setName("TestBulletExplosionParticles");
    101     TestBullet::explosionParticles->setLifeSpan(.5, .3);
    102     TestBullet::explosionParticles->setRadius(0.0, 10);
    103     TestBullet::explosionParticles->setRadius(.5, 20.0);
    104     TestBullet::explosionParticles->setRadius(1.0, 3.0);
    105     TestBullet::explosionParticles->setColor(0.0, 0,1,0,.9);
    106     TestBullet::explosionParticles->setColor(0.5, .8,.8,0,.5);
    107     TestBullet::explosionParticles->setColor(1.0, 1,1,1,.0);
     99    Rocket::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
     100    Rocket::explosionParticles->setName("RocketExplosionParticles");
     101    Rocket::explosionParticles->setLifeSpan(.5, .3);
     102    Rocket::explosionParticles->setRadius(0.0, 10);
     103    Rocket::explosionParticles->setRadius(.5, 20.0);
     104    Rocket::explosionParticles->setRadius(1.0, 3.0);
     105    Rocket::explosionParticles->setColor(0.0, 0,1,0,.9);
     106    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.5);
     107    Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
    108108  }
    109109
    110   ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::trailParticles);
     110  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
    111111
    112112  this->emitter->setEmissionRate(20.0);
     
    115115
    116116
    117 void TestBullet::deactivate()
     117void Rocket::deactivate()
    118118{
    119119  ParticleEngine::getInstance()->breakConnections(this->emitter);
     
    122122//  GarbageCollector::getInstance()->collect(this);
    123123  State::getWorldEntityList()->remove(this);
    124   TestBullet::fastFactory->kill(this);
     124  Rocket::fastFactory->kill(this);
    125125}
    126126
    127127
    128 void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
     128void Rocket::collidesWith(WorldEntity* entity, const Vector& location)
    129129{
    130130  if (this->hitEntity != entity && entity->isA(CL_NPC))
     
    137137 * @param time since last tick
    138138*/
    139 void TestBullet::tick (float time)
     139void Rocket::tick (float time)
    140140{
    141141  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
     
    157157 *  the function gets called, when the projectile is destroyed
    158158*/
    159 void TestBullet::destroy ()
     159void Rocket::destroy ()
    160160{
    161   PRINTF(5)("DESTROY TestBullet\n");
     161  PRINTF(5)("DESTROY Rocket\n");
    162162  this->lifeCycle = .95; //!< @todo calculate this usefully.
    163   ParticleEngine::getInstance()->breakConnection(this->emitter, TestBullet::trailParticles);
    164   ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::explosionParticles);
     163  ParticleEngine::getInstance()->breakConnection(this->emitter, Rocket::trailParticles);
     164  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
    165165
    166166  this->emitter->setEmissionRate(30.0);
     
    171171
    172172
    173 void TestBullet::draw ()
     173void Rocket::draw ()
    174174{
    175175  glMatrixMode(GL_MODELVIEW);
  • trunk/src/world_entities/weapons/rocket.h

    r5449 r5456  
    11/*!
    2     \projectile.h
    3   *  a projectile, that is been shooted by a weapon
     2 * @file rocket.h
     3 * @brief a Rocket Projectile
    44*/
    55
    6 #ifndef _TEST_BULLET_H
    7 #define _TEST_BULLET_H
     6#ifndef _ROCKET_H
     7#define _ROCKET_H
    88
    99#include "projectile.h"
     
    1515class FastFactory;
    1616
    17 class TestBullet : public Projectile
     17class Rocket : public Projectile
    1818{
    1919  public:
    20     TestBullet ();
    21     virtual ~TestBullet ();
     20    Rocket ();
     21    virtual ~Rocket ();
    2222
    2323
     
    4545};
    4646
    47 #endif /* _TEST_BULLET_H */
     47#endif /* _ROCKET_H */
  • trunk/src/world_entities/weapons/test_gun.cc

    r5443 r5456  
    134134
    135135  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
    136   this->setProjectileType(CL_TEST_BULLET);
     136  this->setProjectileType(CL_LASER);
    137137  this->prepareProjectiles(20);
    138138}
  • trunk/src/world_entities/weapons/turret.cc

    r5443 r5456  
    9292
    9393  this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
    94   this->setProjectileType(CL_TEST_BULLET);
     94  this->setProjectileType(CL_ROCKET);
    9595
    9696
Note: See TracChangeset for help on using the changeset viewer.