Changeset 5456 in orxonox.OLD

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:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (29 diffs)
• defs/class_id.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (1 diff)
• world_entities/Makefile.in (modified) (8 diffs)
• world_entities/weapons/laser.cc (copied) (copied from trunk/src/world_entities/weapons/test_bullet.cc) (7 diffs)
• world_entities/weapons/laser.h (copied) (copied from trunk/src/world_entities/weapons/test_bullet.h) (4 diffs)
• world_entities/weapons/rocket.cc (copied) (copied from trunk/src/world_entities/weapons/test_bullet.cc) (8 diffs)
• world_entities/weapons/rocket.h (copied) (copied from trunk/src/world_entities/weapons/test_bullet.h) (3 diffs)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

trunk/src/Makefile.am

@@ -10 +10 @@
 orxonox_CPPFLAGS = -DIS_ORXONOX
 
-orxonox_DEPENDENCIES = lib/libORXlibs.la \
+orxonox_DEPENDENCIES = world_entities/libORXworld_entities.la \
+                       lib/libORXlibs.la \
                        util/libORXutils.la
 

trunk/src/Makefile.in

@@ -55 +55 @@
 am_orxonox_OBJECTS = orxonox-orxonox.$(OBJEXT) \
         orxonox-story_entity.$(OBJEXT) orxonox-campaign.$(OBJEXT) \
-        orxonox-world.$(OBJEXT) orxonox-world_entity.$(OBJEXT) \
-        orxonox-camera.$(OBJEXT) orxonox-player.$(OBJEXT) \
-        orxonox-npc.$(OBJEXT) orxonox-npc2.$(OBJEXT) \
-        orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
-        orxonox-skybox.$(OBJEXT) orxonox-terrain.$(OBJEXT) \
-        orxonox-satellite.$(OBJEXT) \
-        orxonox-character_attributes.$(OBJEXT) \
-        orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \
-        orxonox-weapon.$(OBJEXT) orxonox-projectile.$(OBJEXT) \
-        orxonox-test_gun.$(OBJEXT) orxonox-turret.$(OBJEXT) \
-        orxonox-test_bullet.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \
-        orxonox-power_up.$(OBJEXT) orxonox-turret_power_up.$(OBJEXT) \
-        orxonox-benchmark.$(OBJEXT)
+        orxonox-world.$(OBJEXT) orxonox-benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -74 +62 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox-benchmark.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-campaign.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-character_attributes.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-crosshair.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-environment.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc2.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-player.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-power_up.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-projectile.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-satellite.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-skybox.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-story_entity.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-terrain.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-test_bullet.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-test_entity.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-test_gun.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-turret.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-turret_power_up.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-weapon.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-weapon_manager.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-world.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-world_entity.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-world.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-        -o $@
+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(orxonox_SOURCES)
 DIST_SOURCES = $(orxonox_SOURCES)
@@ -115 +85 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = lib util subprojects .
+DIST_SUBDIRS = lib util world_entities subprojects .
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -121 +91 @@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -133 +104 @@
 CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -144 +116 @@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
 DOXYGEN_TRUE = @DOXYGEN_TRUE@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -149 +122 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 GPROF = @GPROF@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -163 +138 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -182 +159 @@
 SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
@@ -227 +206 @@
 MAINSRCDIR = .
 orxonox_CPPFLAGS = -DIS_ORXONOX
-orxonox_DEPENDENCIES = lib/libORXlibs.a \
-                       util/libORXutils.a \
-                       lib/gui/gtk_gui/libORXgui.a \
-                       lib/graphics/importer/libORXimporter.a \
-                       lib/graphics/libORXgraphics.a \
-                       lib/sound/libORXsound.a \
-                       lib/event/libORXevent.a \
-                       lib/physics/libORXphysics.a \
-                       lib/particles/libORXparticles.a \
-                       lib/collision_detection/libORXcd.a \
-                       lib/graphics/spatial_separation/libORXquadtree.a \
-                       lib/tinyxml/libtinyxml.a \
-                       lib/gui/gl_gui/libORXglgui.a \
-                       lib/shell/libORXshell.a
-
-orxonox_LDADD = util/libORXutils.a \
-                lib/libORXlibs.a \
-                lib/gui/gtk_gui/libORXgui.a \
-                lib/graphics/importer/libORXimporter.a \
-                lib/graphics/libORXgraphics.a \
-                lib/sound/libORXsound.a \
-                lib/event/libORXevent.a \
-                lib/physics/libORXphysics.a \
-                lib/particles/libORXparticles.a \
-                lib/collision_detection/libORXcd.a \
-                lib/graphics/spatial_separation/libORXquadtree.a \
-                lib/tinyxml/libtinyxml.a \
-                lib/gui/gl_gui/libORXglgui.a \
-                lib/shell/libORXshell.a \
+orxonox_DEPENDENCIES = world_entities/libORXworld_entities.la \
+                       lib/libORXlibs.la \
+                       util/libORXutils.la
+
+orxonox_LDADD = world_entities/libORXworld_entities.la \
+                util/libORXutils.la \
+                lib/libORXlibs.la \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
@@ -262 +219 @@
                   story_entities/campaign.cc \
                   story_entities/world.cc \
-                  world_entities/world_entity.cc \
-                  world_entities/camera.cc \
-                  world_entities/player.cc \
-                  world_entities/npc.cc \
-                  world_entities/npc2.cc \
-                  world_entities/environment.cc \
-                  world_entities/skysphere.cc \
-                  world_entities/skybox.cc \
-                  world_entities/terrain.cc \
-                  world_entities/satellite.cc \
-                  world_entities/character_attributes.cc \
-                  world_entities/test_entity.cc \
-                  world_entities/weapons/weapon_manager.cc \
-                  world_entities/weapons/weapon.cc \
-                  world_entities/weapons/projectile.cc \
-                  world_entities/weapons/test_gun.cc \
-                  world_entities/weapons/turret.cc \
-                  world_entities/weapons/test_bullet.cc \
-                  world_entities/weapons/crosshair.cc \
-                  world_entities/power_ups/power_up.cc \
-                  world_entities/power_ups/turret_power_up.cc \
                   subprojects/benchmark.cc
 
@@ -291 +227 @@
                  story_entities/story_def.h \
                  story_entities/campaign.h \
-                 story_entities/world.h \
-                 world_entities/world_entity.h \
-                 world_entities/camera.h \
-                 world_entities/player.h \
-                 world_entities/npc.h \
-                 world_entities/npc2.h \
-                 world_entities/environment.h \
-                 world_entities/skysphere.h \
-                 world_entities/skybox.h \
-                 world_entities/terrain.h \
-                 world_entities/satellite.h \
-                 world_entities/character_attributes.h \
-                 world_entities/test_entity.h \
-                 world_entities/weapons/weapon_manager.h \
-                 world_entities/weapons/weapon.h \
-                 world_entities/weapons/projectile.h \
-                 world_entities/weapons/test_gun.h \
-                 world_entities/weapons/turret.h \
-                 world_entities/weapons/test_bullet.h \
-                 world_entities/weapons/crosshair.h \
-                 world_entities/power_ups/power_up.h \
-                 world_entities/power_ups/turret_power_up.h \
                  defs/stdincl.h \
                  defs/stdlibincl.h \
@@ -340 +254 @@
 SUBDIRS = lib \
           util \
+          world_entities \
           $(SUB_PROGS) \
           .
@@ -346 +261 @@
 
 .SUFFIXES:
-.SUFFIXES: .cc .o .obj
+.SUFFIXES: .cc .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
@@ -382 +297 @@
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
           if test -f $$p \
+             || test -f $$p1 \
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
           else :; fi; \
         done
@@ -398 +314 @@
 
 clean-binPROGRAMS:
-        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+        @list='$(bin_PROGRAMS)'; for p in $$list; do \
+          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+          echo " rm -f $$p $$f"; \
+          rm -f $$p $$f ; \
+        done
 orxonox$(EXEEXT): $(orxonox_OBJECTS) $(orxonox_DEPENDENCIES) 
         @rm -f orxonox$(EXEEXT)
@@ -410 +330 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-benchmark.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-campaign.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-character_attributes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-crosshair.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-environment.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-power_up.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-projectile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-satellite.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-skybox.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-skysphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-story_entity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-terrain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_bullet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_entity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_gun.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret_power_up.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-world.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-world_entity.Po@am__quote@
 
 .cc.o:
@@ -452 +351 @@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
+.cc.lo:
+@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
+
 orxonox-orxonox.o: orxonox.cc
 @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; \
@@ -468 +375 @@
 @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`
 
+orxonox-orxonox.lo: orxonox.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-orxonox.Tpo" "$(DEPDIR)/orxonox-orxonox.Plo"; else rm -f "$(DEPDIR)/orxonox-orxonox.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='orxonox.cc' object='orxonox-orxonox.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-orxonox.Plo' tmpdepfile='$(DEPDIR)/orxonox-orxonox.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
 orxonox-story_entity.o: story_entities/story_entity.cc
 @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; \
@@ -484 +399 @@
 @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`
 
+orxonox-story_entity.lo: story_entities/story_entity.cc
+@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; \
+@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
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/story_entity.cc' object='orxonox-story_entity.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-story_entity.Plo' tmpdepfile='$(DEPDIR)/orxonox-story_entity.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
 orxonox-campaign.o: story_entities/campaign.cc
 @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; \
@@ -500 +423 @@
 @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`
 
+orxonox-campaign.lo: story_entities/campaign.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-campaign.Tpo" "$(DEPDIR)/orxonox-campaign.Plo"; else rm -f "$(DEPDIR)/orxonox-campaign.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/campaign.cc' object='orxonox-campaign.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-campaign.Plo' tmpdepfile='$(DEPDIR)/orxonox-campaign.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
 orxonox-world.o: story_entities/world.cc
 @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; \
@@ -516 +447 @@
 @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`
 
-orxonox-world_entity.o: world_entities/world_entity.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/world_entity.cc' object='orxonox-world_entity.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-world_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-world_entity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-world_entity.o `test -f 'world_entities/world_entity.cc' || echo '$(srcdir)/'`world_entities/world_entity.cc
-
-orxonox-world_entity.obj: world_entities/world_entity.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/world_entity.cc' object='orxonox-world_entity.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-world_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-world_entity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-camera.o: world_entities/camera.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-camera.Tpo" "$(DEPDIR)/orxonox-camera.Po"; else rm -f "$(DEPDIR)/orxonox-camera.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/camera.cc' object='orxonox-camera.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-camera.Po' tmpdepfile='$(DEPDIR)/orxonox-camera.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc
-
-orxonox-camera.obj: world_entities/camera.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-camera.Tpo" "$(DEPDIR)/orxonox-camera.Po"; else rm -f "$(DEPDIR)/orxonox-camera.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/camera.cc' object='orxonox-camera.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-camera.Po' tmpdepfile='$(DEPDIR)/orxonox-camera.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-player.o: world_entities/player.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-player.Tpo" "$(DEPDIR)/orxonox-player.Po"; else rm -f "$(DEPDIR)/orxonox-player.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/player.cc' object='orxonox-player.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-player.Po' tmpdepfile='$(DEPDIR)/orxonox-player.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-player.o `test -f 'world_entities/player.cc' || echo '$(srcdir)/'`world_entities/player.cc
-
-orxonox-player.obj: world_entities/player.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-player.Tpo" "$(DEPDIR)/orxonox-player.Po"; else rm -f "$(DEPDIR)/orxonox-player.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/player.cc' object='orxonox-player.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-player.Po' tmpdepfile='$(DEPDIR)/orxonox-player.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-npc.o: world_entities/npc.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc.Po' tmpdepfile='$(DEPDIR)/orxonox-npc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.o `test -f 'world_entities/npc.cc' || echo '$(srcdir)/'`world_entities/npc.cc
-
-orxonox-npc.obj: world_entities/npc.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc.Po' tmpdepfile='$(DEPDIR)/orxonox-npc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-npc2.o: world_entities/npc2.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc2.cc' object='orxonox-npc2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc2.Po' tmpdepfile='$(DEPDIR)/orxonox-npc2.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc
-
-orxonox-npc2.obj: world_entities/npc2.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc2.cc' object='orxonox-npc2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc2.Po' tmpdepfile='$(DEPDIR)/orxonox-npc2.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-environment.o: world_entities/environment.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-environment.Tpo" "$(DEPDIR)/orxonox-environment.Po"; else rm -f "$(DEPDIR)/orxonox-environment.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/environment.cc' object='orxonox-environment.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-environment.Po' tmpdepfile='$(DEPDIR)/orxonox-environment.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-environment.o `test -f 'world_entities/environment.cc' || echo '$(srcdir)/'`world_entities/environment.cc
-
-orxonox-environment.obj: world_entities/environment.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-environment.Tpo" "$(DEPDIR)/orxonox-environment.Po"; else rm -f "$(DEPDIR)/orxonox-environment.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/environment.cc' object='orxonox-environment.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-environment.Po' tmpdepfile='$(DEPDIR)/orxonox-environment.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-skysphere.o: world_entities/skysphere.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skysphere.Tpo" "$(DEPDIR)/orxonox-skysphere.Po"; else rm -f "$(DEPDIR)/orxonox-skysphere.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='orxonox-skysphere.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skysphere.Po' tmpdepfile='$(DEPDIR)/orxonox-skysphere.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-skysphere.o `test -f 'world_entities/skysphere.cc' || echo '$(srcdir)/'`world_entities/skysphere.cc
-
-orxonox-skysphere.obj: world_entities/skysphere.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skysphere.Tpo" "$(DEPDIR)/orxonox-skysphere.Po"; else rm -f "$(DEPDIR)/orxonox-skysphere.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='orxonox-skysphere.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skysphere.Po' tmpdepfile='$(DEPDIR)/orxonox-skysphere.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-skybox.o: world_entities/skybox.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skybox.Tpo" "$(DEPDIR)/orxonox-skybox.Po"; else rm -f "$(DEPDIR)/orxonox-skybox.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skybox.cc' object='orxonox-skybox.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skybox.Po' tmpdepfile='$(DEPDIR)/orxonox-skybox.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-skybox.o `test -f 'world_entities/skybox.cc' || echo '$(srcdir)/'`world_entities/skybox.cc
-
-orxonox-skybox.obj: world_entities/skybox.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-skybox.Tpo" "$(DEPDIR)/orxonox-skybox.Po"; else rm -f "$(DEPDIR)/orxonox-skybox.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skybox.cc' object='orxonox-skybox.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-skybox.Po' tmpdepfile='$(DEPDIR)/orxonox-skybox.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-terrain.o: world_entities/terrain.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-terrain.Tpo" "$(DEPDIR)/orxonox-terrain.Po"; else rm -f "$(DEPDIR)/orxonox-terrain.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='orxonox-terrain.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-terrain.Po' tmpdepfile='$(DEPDIR)/orxonox-terrain.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-terrain.o `test -f 'world_entities/terrain.cc' || echo '$(srcdir)/'`world_entities/terrain.cc
-
-orxonox-terrain.obj: world_entities/terrain.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-terrain.Tpo" "$(DEPDIR)/orxonox-terrain.Po"; else rm -f "$(DEPDIR)/orxonox-terrain.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='orxonox-terrain.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-terrain.Po' tmpdepfile='$(DEPDIR)/orxonox-terrain.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-satellite.o: world_entities/satellite.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-satellite.Tpo" "$(DEPDIR)/orxonox-satellite.Po"; else rm -f "$(DEPDIR)/orxonox-satellite.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='orxonox-satellite.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-satellite.Po' tmpdepfile='$(DEPDIR)/orxonox-satellite.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-satellite.o `test -f 'world_entities/satellite.cc' || echo '$(srcdir)/'`world_entities/satellite.cc
-
-orxonox-satellite.obj: world_entities/satellite.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-satellite.Tpo" "$(DEPDIR)/orxonox-satellite.Po"; else rm -f "$(DEPDIR)/orxonox-satellite.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='orxonox-satellite.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-satellite.Po' tmpdepfile='$(DEPDIR)/orxonox-satellite.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-character_attributes.o: world_entities/character_attributes.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='orxonox-character_attributes.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-character_attributes.Po' tmpdepfile='$(DEPDIR)/orxonox-character_attributes.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc
-
-orxonox-character_attributes.obj: world_entities/character_attributes.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='orxonox-character_attributes.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-character_attributes.Po' tmpdepfile='$(DEPDIR)/orxonox-character_attributes.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-test_entity.o: world_entities/test_entity.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_entity.cc' object='orxonox-test_entity.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-test_entity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_entity.o `test -f 'world_entities/test_entity.cc' || echo '$(srcdir)/'`world_entities/test_entity.cc
-
-orxonox-test_entity.obj: world_entities/test_entity.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_entity.cc' object='orxonox-test_entity.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_entity.Po' tmpdepfile='$(DEPDIR)/orxonox-test_entity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-weapon_manager.o: world_entities/weapons/weapon_manager.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon_manager.cc' object='orxonox-weapon_manager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon_manager.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon_manager.o `test -f 'world_entities/weapons/weapon_manager.cc' || echo '$(srcdir)/'`world_entities/weapons/weapon_manager.cc
-
-orxonox-weapon_manager.obj: world_entities/weapons/weapon_manager.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon_manager.cc' object='orxonox-weapon_manager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon_manager.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-weapon.o: world_entities/weapons/weapon.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon.cc' object='orxonox-weapon.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon.o `test -f 'world_entities/weapons/weapon.cc' || echo '$(srcdir)/'`world_entities/weapons/weapon.cc
-
-orxonox-weapon.obj: world_entities/weapons/weapon.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon.cc' object='orxonox-weapon.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-projectile.o: world_entities/weapons/projectile.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/projectile.cc' object='orxonox-projectile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-projectile.o `test -f 'world_entities/weapons/projectile.cc' || echo '$(srcdir)/'`world_entities/weapons/projectile.cc
-
-orxonox-projectile.obj: world_entities/weapons/projectile.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/projectile.cc' object='orxonox-projectile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-test_gun.o: world_entities/weapons/test_gun.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_gun.cc' object='orxonox-test_gun.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_gun.o `test -f 'world_entities/weapons/test_gun.cc' || echo '$(srcdir)/'`world_entities/weapons/test_gun.cc
-
-orxonox-test_gun.obj: world_entities/weapons/test_gun.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_gun.cc' object='orxonox-test_gun.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-turret.o: world_entities/weapons/turret.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-turret.Tpo" "$(DEPDIR)/orxonox-turret.Po"; else rm -f "$(DEPDIR)/orxonox-turret.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/turret.cc' object='orxonox-turret.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret.Po' tmpdepfile='$(DEPDIR)/orxonox-turret.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret.o `test -f 'world_entities/weapons/turret.cc' || echo '$(srcdir)/'`world_entities/weapons/turret.cc
-
-orxonox-turret.obj: world_entities/weapons/turret.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-turret.Tpo" "$(DEPDIR)/orxonox-turret.Po"; else rm -f "$(DEPDIR)/orxonox-turret.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/turret.cc' object='orxonox-turret.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret.Po' tmpdepfile='$(DEPDIR)/orxonox-turret.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-test_bullet.o: world_entities/weapons/test_bullet.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_bullet.cc' object='orxonox-test_bullet.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_bullet.o `test -f 'world_entities/weapons/test_bullet.cc' || echo '$(srcdir)/'`world_entities/weapons/test_bullet.cc
-
-orxonox-test_bullet.obj: world_entities/weapons/test_bullet.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_bullet.cc' object='orxonox-test_bullet.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
-
-orxonox-crosshair.o: world_entities/weapons/crosshair.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-crosshair.Tpo" "$(DEPDIR)/orxonox-crosshair.Po"; else rm -f "$(DEPDIR)/orxonox-crosshair.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/crosshair.cc' object='orxonox-crosshair.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-crosshair.Po' tmpdepfile='$(DEPDIR)/orxonox-crosshair.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-crosshair.o `test -f 'world_entities/weapons/crosshair.cc' || echo '$(srcdir)/'`world_entities/weapons/crosshair.cc
-
-orxonox-crosshair.obj: world_entities/weapons/crosshair.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-crosshair.Tpo" "$(DEPDIR)/orxonox-crosshair.Po"; else rm -f "$(DEPDIR)/orxonox-crosshair.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/crosshair.cc' object='orxonox-crosshair.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-crosshair.Po' tmpdepfile='$(DEPDIR)/orxonox-crosshair.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-crosshair.obj `if test -f 'world_entities/weapons/crosshair.cc'; then $(CYGPATH_W) 'world_entities/weapons/crosshair.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/crosshair.cc'; fi`
-
-orxonox-power_up.o: world_entities/power_ups/power_up.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-power_up.o -MD -MP -MF "$(DEPDIR)/orxonox-power_up.Tpo" -c -o orxonox-power_up.o `test -f 'world_entities/power_ups/power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/power_up.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-power_up.Tpo" "$(DEPDIR)/orxonox-power_up.Po"; else rm -f "$(DEPDIR)/orxonox-power_up.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-power_up.o `test -f 'world_entities/power_ups/power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/power_up.cc
-
-orxonox-power_up.obj: world_entities/power_ups/power_up.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-power_up.obj -MD -MP -MF "$(DEPDIR)/orxonox-power_up.Tpo" -c -o orxonox-power_up.obj `if test -f 'world_entities/power_ups/power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/power_up.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-power_up.Tpo" "$(DEPDIR)/orxonox-power_up.Po"; else rm -f "$(DEPDIR)/orxonox-power_up.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/power_up.cc' object='orxonox-power_up.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-power_up.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-power_up.obj `if test -f 'world_entities/power_ups/power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/power_up.cc'; fi`
-
-orxonox-turret_power_up.o: world_entities/power_ups/turret_power_up.cc
-@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; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/turret_power_up.cc' object='orxonox-turret_power_up.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret_power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-turret_power_up.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret_power_up.o `test -f 'world_entities/power_ups/turret_power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/turret_power_up.cc
-
-orxonox-turret_power_up.obj: world_entities/power_ups/turret_power_up.cc
-@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`; \
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/power_ups/turret_power_up.cc' object='orxonox-turret_power_up.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-turret_power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-turret_power_up.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
+orxonox-world.lo: story_entities/world.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-world.Tpo" "$(DEPDIR)/orxonox-world.Plo"; else rm -f "$(DEPDIR)/orxonox-world.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/world.cc' object='orxonox-world.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-world.Plo' tmpdepfile='$(DEPDIR)/orxonox-world.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
 
 orxonox-benchmark.o: subprojects/benchmark.cc
@@ -867 +470 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-benchmark.obj `if test -f 'subprojects/benchmark.cc'; then $(CYGPATH_W) 'subprojects/benchmark.cc'; else $(CYGPATH_W) '$(srcdir)/subprojects/benchmark.cc'; fi`
+
+orxonox-benchmark.lo: subprojects/benchmark.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-benchmark.Tpo" "$(DEPDIR)/orxonox-benchmark.Plo"; else rm -f "$(DEPDIR)/orxonox-benchmark.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='subprojects/benchmark.cc' object='orxonox-benchmark.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-benchmark.Plo' tmpdepfile='$(DEPDIR)/orxonox-benchmark.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+mostlyclean-libtool:
+        -rm -f *.lo
+
+clean-libtool:
+        -rm -rf .libs _libs
+
+distclean-libtool:
+        -rm -f libtool
 uninstall-info-am:
 
@@ -990 +610 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
+        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -1064 +684 @@
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
@@ -1070 +690 @@
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
+        distclean-libtool distclean-tags
 
 dvi: dvi-recursive
@@ -1099 +719 @@
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 
 pdf: pdf-recursive
@@ -1114 +735 @@
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-        clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-        ctags-recursive distclean distclean-compile distclean-generic \
+        clean clean-binPROGRAMS clean-generic clean-libtool \
+        clean-recursive ctags ctags-recursive distclean \
+        distclean-compile distclean-generic distclean-libtool \
         distclean-recursive distclean-tags distdir dvi dvi-am html \
         html-am info info-am install install-am install-binPROGRAMS \
@@ -1123 +745 @@
         maintainer-clean maintainer-clean-generic \
         maintainer-clean-recursive mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-        tags tags-recursive uninstall uninstall-am \
+        mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
         uninstall-binPROGRAMS uninstall-info-am
 

trunk/src/defs/class_id.h

@@ -128 +128 @@
   CL_SKYSPHERE                  =    0x00000206,
   CL_TERRAIN                    =    0x00000207,
-  CL_TEST_BULLET                =    0x00000208,
   CL_TEST_ENTITY                =    0x00000209,
-  CL_TEST_GUN                   =    0x0000020a,
-  CL_TURRET                     =    0x0000020b,
-
-  CL_TURRET_POWER_UP            =    0x0000020b,
+
+  CL_TURRET_POWER_UP            =    0x00000211,
+
+  CL_TEST_GUN                   =    0x00000230,
+  CL_TURRET                     =    0x00000231,
+
+
+  CL_TEST_BULLET                =    0x00000240,
+  CL_ROCKET                     =    0x00000241,
+  CL_LASER                      =    0x00000242,
 
 

trunk/src/lib/gui/gl_gui/glgui_widget.h

@@ -47 +47 @@
 
     void show();
-    void hide();
+    void hide() {};
 
     void connectSignal(GLGuiSignalType signalType, Signal* signal);

trunk/src/world_entities/Makefile.am

@@ -19 +19 @@
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
-                  weapons/projectile.cc \
                   weapons/test_gun.cc \
                   weapons/turret.cc \
+                  weapons/projectile.cc \
                   weapons/test_bullet.cc \
+                  weapons/rocket.cc \
+                  weapons/laser.cc \
                   weapons/crosshair.cc \
                   power_ups/power_up.cc \

trunk/src/world_entities/Makefile.in

@@ -56 +56 @@
         player.lo npc.lo npc2.lo environment.lo skysphere.lo skybox.lo \
         terrain.lo satellite.lo character_attributes.lo test_entity.lo \
-        weapon_manager.lo weapon.lo projectile.lo test_gun.lo \
-        turret.lo test_bullet.lo crosshair.lo power_up.lo \
-        turret_power_up.lo
+        weapon_manager.lo weapon.lo test_gun.lo turret.lo \
+        projectile.lo test_bullet.lo rocket.lo laser.lo crosshair.lo \
+        power_up.lo turret_power_up.lo
 libORXworld_entities_la_OBJECTS =  \
         $(am_libORXworld_entities_la_OBJECTS)
@@ -67 +67 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/crosshair.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/environment.Plo ./$(DEPDIR)/npc.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/npc2.Plo ./$(DEPDIR)/player.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/power_up.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Plo \
+@AMDEP_TRUE@    ./$(DEPDIR)/environment.Plo ./$(DEPDIR)/laser.Plo \
+@AMDEP_TRUE@    ./$(DEPDIR)/npc.Plo ./$(DEPDIR)/npc2.Plo \
+@AMDEP_TRUE@    ./$(DEPDIR)/player.Plo ./$(DEPDIR)/power_up.Plo \
+@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Plo ./$(DEPDIR)/rocket.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/satellite.Plo ./$(DEPDIR)/skybox.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Plo ./$(DEPDIR)/terrain.Plo \
@@ -235 +235 @@
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
-                  weapons/projectile.cc \
                   weapons/test_gun.cc \
                   weapons/turret.cc \
+                  weapons/projectile.cc \
                   weapons/test_bullet.cc \
+                  weapons/rocket.cc \
+                  weapons/laser.cc \
                   weapons/crosshair.cc \
                   power_ups/power_up.cc \
@@ -340 +342 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crosshair.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/npc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/npc2.Plo@am__quote@
@@ -345 +348 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power_up.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rocket.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/satellite.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Plo@am__quote@
@@ -430 +434 @@
 @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
 
+test_gun.o: weapons/test_gun.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+test_gun.obj: weapons/test_gun.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+test_gun.lo: weapons/test_gun.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Plo"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Plo' tmpdepfile='$(DEPDIR)/test_gun.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+turret.o: weapons/turret.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+turret.obj: weapons/turret.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+turret.lo: weapons/turret.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Plo"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Plo' tmpdepfile='$(DEPDIR)/turret.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
 projectile.o: weapons/projectile.cc
 @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; \
@@ -454 +506 @@
 @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
 
-test_gun.o: weapons/test_gun.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
-test_gun.obj: weapons/test_gun.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
-
-test_gun.lo: weapons/test_gun.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Plo"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Plo' tmpdepfile='$(DEPDIR)/test_gun.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
-turret.o: weapons/turret.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
-turret.obj: weapons/turret.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Po"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Po' tmpdepfile='$(DEPDIR)/turret.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
-
-turret.lo: weapons/turret.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Plo"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Plo' tmpdepfile='$(DEPDIR)/turret.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
 test_bullet.o: weapons/test_bullet.cc
 @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; \
@@ -525 +529 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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
+
+rocket.o: weapons/rocket.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/rocket.Tpo" "$(DEPDIR)/rocket.Po"; else rm -f "$(DEPDIR)/rocket.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/rocket.cc' object='rocket.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/rocket.Po' tmpdepfile='$(DEPDIR)/rocket.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+rocket.obj: weapons/rocket.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/rocket.Tpo" "$(DEPDIR)/rocket.Po"; else rm -f "$(DEPDIR)/rocket.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/rocket.cc' object='rocket.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/rocket.Po' tmpdepfile='$(DEPDIR)/rocket.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+rocket.lo: weapons/rocket.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/rocket.Tpo" "$(DEPDIR)/rocket.Plo"; else rm -f "$(DEPDIR)/rocket.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/rocket.cc' object='rocket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/rocket.Plo' tmpdepfile='$(DEPDIR)/rocket.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+laser.o: weapons/laser.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/laser.Tpo" "$(DEPDIR)/laser.Po"; else rm -f "$(DEPDIR)/laser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/laser.cc' object='laser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/laser.Po' tmpdepfile='$(DEPDIR)/laser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+laser.obj: weapons/laser.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/laser.Tpo" "$(DEPDIR)/laser.Po"; else rm -f "$(DEPDIR)/laser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/laser.cc' object='laser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/laser.Po' tmpdepfile='$(DEPDIR)/laser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+laser.lo: weapons/laser.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/laser.Tpo" "$(DEPDIR)/laser.Plo"; else rm -f "$(DEPDIR)/laser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/laser.cc' object='laser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/laser.Plo' tmpdepfile='$(DEPDIR)/laser.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
 
 crosshair.o: weapons/crosshair.cc

trunk/src/world_entities/weapons/laser.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "test_bullet.h"
+#include "laser.h"
 
 #include "fast_factory.h"
@@ -31 +31 @@
 using namespace std;
 
-CREATE_FAST_FACTORY_STATIC(TestBullet, CL_TEST_BULLET);
+CREATE_FAST_FACTORY_STATIC(Laser, CL_LASER);
 
 /**
  *  standard constructor
 */
-TestBullet::TestBullet () : Projectile()
+Laser::Laser () : Projectile()
 {
-  this->setClassID(CL_TEST_BULLET, "TestBullet");
+  this->setClassID(CL_TEST_BULLET, "Laser");
 
   float modelSize = .3;
-  this->loadModelWithScale("models/projectiles/orx-rocket.obj", .3);
+  this->loadModelWithScale("models/projectiles/lasers.obj", .3);
 
   this->energyMin = 1;
@@ -51 +51 @@
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
+  this->emitter->setEmissionRate(30.0);
+  this->emitter->setEmissionVelocity(50.0);
 }
 
@@ -57 +59 @@
  *  standard deconstructor
 */
-TestBullet::~TestBullet ()
+Laser::~Laser ()
 {
   // delete this->emitter;
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (TestBullet::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (Laser::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
   {
-    if (ClassList::exists(TestBullet::trailParticles, CL_PARTICLE_SYSTEM))
-      delete TestBullet::trailParticles;
-    TestBullet::trailParticles = NULL;
-  }
-  if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
-  {
-    if (ClassList::exists(TestBullet::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete TestBullet::explosionParticles;
-    TestBullet::explosionParticles = NULL;
+    if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))
+      delete Laser::explosionParticles;
+    Laser::explosionParticles = NULL;
   }
 
 }
 
-ParticleSystem* TestBullet::trailParticles = NULL;
-ParticleSystem* TestBullet::explosionParticles = NULL;
+ParticleSystem* Laser::explosionParticles = NULL;
 
-void TestBullet::activate()
+void Laser::activate()
 {
   State::getWorldEntityList()->add(this);
-  if (unlikely(TestBullet::trailParticles == NULL))
+  if (unlikely(Laser::explosionParticles == NULL))
   {
-    TestBullet::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
-    TestBullet::trailParticles->setName("TestBulletTrailParticles");
-    TestBullet::trailParticles->setLifeSpan(.5, .3);
-    TestBullet::trailParticles->setRadius(0.0, .5);
-    TestBullet::trailParticles->setRadius(0.5, 2.0);
-    TestBullet::trailParticles->setRadius(1.0, 5.0);
-    TestBullet::trailParticles->setColor(0.0, 1,0,0,.7);
-    TestBullet::trailParticles->setColor(0.5, .8,.8,0,.5);
-    TestBullet::trailParticles->setColor(1.0, .7,.7,.7,.0);
+    Laser::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    Laser::explosionParticles->setName("LaserExplosionParticles");
+    Laser::explosionParticles->setLifeSpan(.5, .3);
+    Laser::explosionParticles->setRadius(0.0, 10);
+    Laser::explosionParticles->setRadius(.5, 20.0);
+    Laser::explosionParticles->setRadius(1.0, 3.0);
+    Laser::explosionParticles->setColor(0.0, 0,1,0,.9);
+    Laser::explosionParticles->setColor(0.5, .8,.8,0,.5);
+    Laser::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
-  if (unlikely(TestBullet::explosionParticles == NULL))
-  {
-    TestBullet::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
-    TestBullet::explosionParticles->setName("TestBulletExplosionParticles");
-    TestBullet::explosionParticles->setLifeSpan(.5, .3);
-    TestBullet::explosionParticles->setRadius(0.0, 10);
-    TestBullet::explosionParticles->setRadius(.5, 20.0);
-    TestBullet::explosionParticles->setRadius(1.0, 3.0);
-    TestBullet::explosionParticles->setColor(0.0, 0,1,0,.9);
-    TestBullet::explosionParticles->setColor(0.5, .8,.8,0,.5);
-    TestBullet::explosionParticles->setColor(1.0, 1,1,1,.0);
-  }
-
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::trailParticles);
-
-  this->emitter->setEmissionRate(20.0);
-  this->emitter->setEmissionVelocity(3.0);
 }
 
 
-void TestBullet::deactivate()
+void Laser::deactivate()
 {
   ParticleEngine::getInstance()->breakConnections(this->emitter);
@@ -122 +100 @@
 //  GarbageCollector::getInstance()->collect(this);
   State::getWorldEntityList()->remove(this);
-  TestBullet::fastFactory->kill(this);
+  Laser::fastFactory->kill(this);
 }
 
 
-void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
+void Laser::collidesWith(WorldEntity* entity, const Vector& location)
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
@@ -137 +115 @@
  * @param time since last tick
 */
-void TestBullet::tick (float time)
+void Laser::tick (float time)
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
@@ -157 +135 @@
  *  the function gets called, when the projectile is destroyed
 */
-void TestBullet::destroy ()
+void Laser::destroy ()
 {
-  PRINTF(5)("DESTROY TestBullet\n");
+  PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, TestBullet::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::explosionParticles);
-
-  this->emitter->setEmissionRate(30.0);
-  this->emitter->setEmissionVelocity(50.0);
-//  this->deactivate();
+  ParticleEngine::getInstance()->addConnection(this->emitter, Laser::explosionParticles);
 
 }
 
 
-void TestBullet::draw ()
+void Laser::draw ()
 {
   glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/laser.h

@@ -1 +1 @@
 /*!
-    \projectile.h
-  *  a projectile, that is been shooted by a weapon
+ * @file laser.h
+ * @brief a projectile, that is been shooted by a weapon
 */
 
-#ifndef _TEST_BULLET_H
-#define _TEST_BULLET_H
+#ifndef _LASER_H
+#define _LASER_H
 
 #include "projectile.h"
@@ -15 +15 @@
 class FastFactory;
 
-class TestBullet : public Projectile
+class Laser : public Projectile
 {
   public:
-    TestBullet ();
-    virtual ~TestBullet ();
+    Laser ();
+    virtual ~Laser ();
 
 
@@ -35 +35 @@
   private:
     static FastFactory*               fastFactory;
-    static ParticleSystem*            trailParticles;
+
     static ParticleSystem*            explosionParticles;
 
@@ -45 +45 @@
 };
 
-#endif /* _TEST_BULLET_H */
+#endif /* _LASER_H */

trunk/src/world_entities/weapons/rocket.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "test_bullet.h"
+#include "rocket.h"
 
 #include "fast_factory.h"
@@ -31 +31 @@
 using namespace std;
 
-CREATE_FAST_FACTORY_STATIC(TestBullet, CL_TEST_BULLET);
+CREATE_FAST_FACTORY_STATIC(Rocket, CL_ROCKET);
 
 /**
  *  standard constructor
 */
-TestBullet::TestBullet () : Projectile()
+Rocket::Rocket () : Projectile()
 {
-  this->setClassID(CL_TEST_BULLET, "TestBullet");
+  this->setClassID(CL_TEST_BULLET, "Rocket");
 
   float modelSize = .3;
@@ -57 +57 @@
  *  standard deconstructor
 */
-TestBullet::~TestBullet ()
+Rocket::~Rocket ()
 {
   // delete this->emitter;
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (TestBullet::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (Rocket::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
   {
-    if (ClassList::exists(TestBullet::trailParticles, CL_PARTICLE_SYSTEM))
-      delete TestBullet::trailParticles;
-    TestBullet::trailParticles = NULL;
+    if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
+      delete Rocket::trailParticles;
+    Rocket::trailParticles = NULL;
   }
-  if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
   {
-    if (ClassList::exists(TestBullet::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete TestBullet::explosionParticles;
-    TestBullet::explosionParticles = NULL;
+    if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))
+      delete Rocket::explosionParticles;
+    Rocket::explosionParticles = NULL;
   }
 
 }
 
-ParticleSystem* TestBullet::trailParticles = NULL;
-ParticleSystem* TestBullet::explosionParticles = NULL;
+ParticleSystem* Rocket::trailParticles = NULL;
+ParticleSystem* Rocket::explosionParticles = NULL;
 
-void TestBullet::activate()
+void Rocket::activate()
 {
   State::getWorldEntityList()->add(this);
-  if (unlikely(TestBullet::trailParticles == NULL))
+  if (unlikely(Rocket::trailParticles == NULL))
   {
-    TestBullet::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
-    TestBullet::trailParticles->setName("TestBulletTrailParticles");
-    TestBullet::trailParticles->setLifeSpan(.5, .3);
-    TestBullet::trailParticles->setRadius(0.0, .5);
-    TestBullet::trailParticles->setRadius(0.5, 2.0);
-    TestBullet::trailParticles->setRadius(1.0, 5.0);
-    TestBullet::trailParticles->setColor(0.0, 1,0,0,.7);
-    TestBullet::trailParticles->setColor(0.5, .8,.8,0,.5);
-    TestBullet::trailParticles->setColor(1.0, .7,.7,.7,.0);
+    Rocket::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    Rocket::trailParticles->setName("RocketTrailParticles");
+    Rocket::trailParticles->setLifeSpan(.5, .3);
+    Rocket::trailParticles->setRadius(0.0, .5);
+    Rocket::trailParticles->setRadius(0.5, 2.0);
+    Rocket::trailParticles->setRadius(1.0, 5.0);
+    Rocket::trailParticles->setColor(0.0, 1,0,0,.7);
+    Rocket::trailParticles->setColor(0.5, .8,.8,0,.5);
+    Rocket::trailParticles->setColor(1.0, .7,.7,.7,.0);
   }
-  if (unlikely(TestBullet::explosionParticles == NULL))
+  if (unlikely(Rocket::explosionParticles == NULL))
   {
-    TestBullet::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
-    TestBullet::explosionParticles->setName("TestBulletExplosionParticles");
-    TestBullet::explosionParticles->setLifeSpan(.5, .3);
-    TestBullet::explosionParticles->setRadius(0.0, 10);
-    TestBullet::explosionParticles->setRadius(.5, 20.0);
-    TestBullet::explosionParticles->setRadius(1.0, 3.0);
-    TestBullet::explosionParticles->setColor(0.0, 0,1,0,.9);
-    TestBullet::explosionParticles->setColor(0.5, .8,.8,0,.5);
-    TestBullet::explosionParticles->setColor(1.0, 1,1,1,.0);
+    Rocket::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    Rocket::explosionParticles->setName("RocketExplosionParticles");
+    Rocket::explosionParticles->setLifeSpan(.5, .3);
+    Rocket::explosionParticles->setRadius(0.0, 10);
+    Rocket::explosionParticles->setRadius(.5, 20.0);
+    Rocket::explosionParticles->setRadius(1.0, 3.0);
+    Rocket::explosionParticles->setColor(0.0, 0,1,0,.9);
+    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.5);
+    Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::trailParticles);
+  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
 
   this->emitter->setEmissionRate(20.0);
@@ -115 +115 @@
 
 
-void TestBullet::deactivate()
+void Rocket::deactivate()
 {
   ParticleEngine::getInstance()->breakConnections(this->emitter);
@@ -122 +122 @@
 //  GarbageCollector::getInstance()->collect(this);
   State::getWorldEntityList()->remove(this);
-  TestBullet::fastFactory->kill(this);
+  Rocket::fastFactory->kill(this);
 }
 
 
-void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
+void Rocket::collidesWith(WorldEntity* entity, const Vector& location)
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
@@ -137 +137 @@
  * @param time since last tick
 */
-void TestBullet::tick (float time)
+void Rocket::tick (float time)
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
@@ -157 +157 @@
  *  the function gets called, when the projectile is destroyed
 */
-void TestBullet::destroy ()
+void Rocket::destroy ()
 {
-  PRINTF(5)("DESTROY TestBullet\n");
+  PRINTF(5)("DESTROY Rocket\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, TestBullet::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::explosionParticles);
+  ParticleEngine::getInstance()->breakConnection(this->emitter, Rocket::trailParticles);
+  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
 
   this->emitter->setEmissionRate(30.0);
@@ -171 +171 @@
 
 
-void TestBullet::draw ()
+void Rocket::draw ()
 {
   glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/rocket.h

@@ -1 +1 @@
 /*!
-    \projectile.h
-  *  a projectile, that is been shooted by a weapon
+ * @file rocket.h
+ * @brief a Rocket Projectile
 */
 
-#ifndef _TEST_BULLET_H
-#define _TEST_BULLET_H
+#ifndef _ROCKET_H
+#define _ROCKET_H
 
 #include "projectile.h"
@@ -15 +15 @@
 class FastFactory;
 
-class TestBullet : public Projectile
+class Rocket : public Projectile
 {
   public:
-    TestBullet ();
-    virtual ~TestBullet ();
+    Rocket ();
+    virtual ~Rocket ();
 
 
@@ -45 +45 @@
 };
 
-#endif /* _TEST_BULLET_H */
+#endif /* _ROCKET_H */

trunk/src/world_entities/weapons/test_gun.cc

@@ -134 +134 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->setProjectileType(CL_TEST_BULLET);
+  this->setProjectileType(CL_LASER);
   this->prepareProjectiles(20);
 }

trunk/src/world_entities/weapons/turret.cc

@@ -92 +92 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_TEST_BULLET);
+  this->setProjectileType(CL_ROCKET);