Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4758 in orxonox.OLD for orxonox/trunk/src


Ignore:
Timestamp:
Jul 1, 2005, 8:57:24 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: moved the weapons to world_entities/weapons

Location:
orxonox/trunk/src
Files:
1 added
4 edited
8 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r4745 r4758  
    5454                  world_entities/skybox.cc \
    5555                  world_entities/terrain.cc \
    56                   world_entities/weapon.cc \
    57                   world_entities/projectile.cc \
    5856                  world_entities/satellite.cc \
    5957                  world_entities/character_attributes.cc \
    60                   world_entities/test_gun.cc \
    61                   world_entities/test_bullet.cc \
    6258                  world_entities/test_entity.cc \
     59                  world_entities/weapons/weapon.cc \
     60                  world_entities/weapons/projectile.cc \
     61                  world_entities/weapons/test_gun.cc \
     62                  world_entities/weapons/test_bullet.cc \
    6363                  lib/coord/p_node.cc \
    6464                  lib/coord/null_parent.cc \
    … …  
    6767                  lib/graphics/text_engine.cc \
    6868                  lib/lang/base_object.cc \
    69                   lib/lang/class_list.cc \
     69                  lib/lang/class_list.cc \
    7070                  lib/util/ini_parser.cc \
    7171                  lib/util/substring.cc \
    … …  
    105105                 world_entities/power_up.h \
    106106                 world_entities/terrain.h \
    107                  world_entities/weapon.h \
    108                  world_entities/projectile.h \
    109107                 world_entities/satellite.h \
    110108                 world_entities/character_attributes.h \
    111                  world_entities/test_gun.h \
    112                  world_entities/test_bullet.h \
    113109                 world_entities/test_entity.h \
     110                 world_entities/weapons/weapon.h \
     111                 world_entities/weapons/projectile.h \
     112                 world_entities/weapons/test_gun.h \
     113                 world_entities/weapons/test_bullet.h \
    114114                 defs/stdincl.h \
    115115                 defs/stdlibincl.h \

  • orxonox/trunk/src/Makefile.in

    r4745 r4758  
    6767        orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
    6868        orxonox-skybox.$(OBJEXT) orxonox-terrain.$(OBJEXT) \
    69         orxonox-weapon.$(OBJEXT) orxonox-projectile.$(OBJEXT) \
    7069        orxonox-satellite.$(OBJEXT) \
    7170        orxonox-character_attributes.$(OBJEXT) \
    72         orxonox-test_gun.$(OBJEXT) orxonox-test_bullet.$(OBJEXT) \
    73         orxonox-test_entity.$(OBJEXT) orxonox-p_node.$(OBJEXT) \
     71        orxonox-test_entity.$(OBJEXT) orxonox-weapon.$(OBJEXT) \
     72        orxonox-projectile.$(OBJEXT) orxonox-test_gun.$(OBJEXT) \
     73        orxonox-test_bullet.$(OBJEXT) orxonox-p_node.$(OBJEXT) \
    7474        orxonox-null_parent.$(OBJEXT) \
    7575        orxonox-graphics_engine.$(OBJEXT) orxonox-light.$(OBJEXT) \
    … …  
    299299                  world_entities/skybox.cc \
    300300                  world_entities/terrain.cc \
    301                   world_entities/weapon.cc \
    302                   world_entities/projectile.cc \
    303301                  world_entities/satellite.cc \
    304302                  world_entities/character_attributes.cc \
    305                   world_entities/test_gun.cc \
    306                   world_entities/test_bullet.cc \
    307303                  world_entities/test_entity.cc \
     304                  world_entities/weapons/weapon.cc \
     305                  world_entities/weapons/projectile.cc \
     306                  world_entities/weapons/test_gun.cc \
     307                  world_entities/weapons/test_bullet.cc \
    308308                  lib/coord/p_node.cc \
    309309                  lib/coord/null_parent.cc \
    … …  
    312312                  lib/graphics/text_engine.cc \
    313313                  lib/lang/base_object.cc \
    314                   lib/lang/class_list.cc \
     314                  lib/lang/class_list.cc \
    315315                  lib/util/ini_parser.cc \
    316316                  lib/util/substring.cc \
    … …  
    350350                 world_entities/power_up.h \
    351351                 world_entities/terrain.h \
    352                  world_entities/weapon.h \
    353                  world_entities/projectile.h \
    354352                 world_entities/satellite.h \
    355353                 world_entities/character_attributes.h \
    356                  world_entities/test_gun.h \
    357                  world_entities/test_bullet.h \
    358354                 world_entities/test_entity.h \
     355                 world_entities/weapons/weapon.h \
     356                 world_entities/weapons/projectile.h \
     357                 world_entities/weapons/test_gun.h \
     358                 world_entities/weapons/test_bullet.h \
    359359                 defs/stdincl.h \
    360360                 defs/stdlibincl.h \
    … …  
    906906@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`
    907907
    908 orxonox-weapon.o: world_entities/weapon.cc
    909 @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/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc; \
    910 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
    911 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='orxonox-weapon.o' libtool=no @AMDEPBACKSLASH@
    912 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
    913 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    914 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon.o `test -f 'world_entities/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc
    915 
    916 orxonox-weapon.obj: world_entities/weapon.cc
    917 @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/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`; \
    918 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
    919 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='orxonox-weapon.obj' libtool=no @AMDEPBACKSLASH@
    920 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
    921 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    922 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-weapon.obj `if test -f 'world_entities/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`
    923 
    924 orxonox-projectile.o: world_entities/projectile.cc
    925 @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/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc; \
    926 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
    927 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='orxonox-projectile.o' libtool=no @AMDEPBACKSLASH@
    928 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
    929 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    930 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-projectile.o `test -f 'world_entities/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc
    931 
    932 orxonox-projectile.obj: world_entities/projectile.cc
    933 @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/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`; \
    934 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
    935 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='orxonox-projectile.obj' libtool=no @AMDEPBACKSLASH@
    936 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
    937 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    938 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`
    939 
    940908orxonox-satellite.o: world_entities/satellite.cc
    941909@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; \
    … …  
    970938@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`
    971939
    972 orxonox-test_gun.o: world_entities/test_gun.cc
    973 @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/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc; \
    974 @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
    975 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='orxonox-test_gun.o' libtool=no @AMDEPBACKSLASH@
    976 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
    977 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    978 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_gun.o `test -f 'world_entities/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc
    979 
    980 orxonox-test_gun.obj: world_entities/test_gun.cc
    981 @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/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`; \
    982 @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
    983 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='orxonox-test_gun.obj' libtool=no @AMDEPBACKSLASH@
    984 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
    985 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    986 @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/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`
    987 
    988 orxonox-test_bullet.o: world_entities/test_bullet.cc
    989 @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/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc; \
    990 @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
    991 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='orxonox-test_bullet.o' libtool=no @AMDEPBACKSLASH@
    992 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
    993 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    994 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_bullet.o `test -f 'world_entities/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc
    995 
    996 orxonox-test_bullet.obj: world_entities/test_bullet.cc
    997 @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/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`; \
    998 @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
    999 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='orxonox-test_bullet.obj' libtool=no @AMDEPBACKSLASH@
    1000 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
    1001 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1002 @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/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`
    1003 
    1004940orxonox-test_entity.o: world_entities/test_entity.cc
    1005941@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; \
    … …  
    1017953@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1018954@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`
     955
     956orxonox-weapon.o: world_entities/weapons/weapon.cc
     957@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; \
     958@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
     959@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon.cc' object='orxonox-weapon.o' libtool=no @AMDEPBACKSLASH@
     960@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
     961@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     962@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
     963
     964orxonox-weapon.obj: world_entities/weapons/weapon.cc
     965@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`; \
     966@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-weapon.Tpo" "$(DEPDIR)/orxonox-weapon.Po"; else rm -f "$(DEPDIR)/orxonox-weapon.Tpo"; exit 1; fi
     967@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/weapon.cc' object='orxonox-weapon.obj' libtool=no @AMDEPBACKSLASH@
     968@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-weapon.Po' tmpdepfile='$(DEPDIR)/orxonox-weapon.TPo' @AMDEPBACKSLASH@
     969@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     970@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`
     971
     972orxonox-projectile.o: world_entities/weapons/projectile.cc
     973@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; \
     974@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
     975@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/projectile.cc' object='orxonox-projectile.o' libtool=no @AMDEPBACKSLASH@
     976@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
     977@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     978@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
     979
     980orxonox-projectile.obj: world_entities/weapons/projectile.cc
     981@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`; \
     982@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-projectile.Tpo" "$(DEPDIR)/orxonox-projectile.Po"; else rm -f "$(DEPDIR)/orxonox-projectile.Tpo"; exit 1; fi
     983@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/projectile.cc' object='orxonox-projectile.obj' libtool=no @AMDEPBACKSLASH@
     984@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-projectile.Po' tmpdepfile='$(DEPDIR)/orxonox-projectile.TPo' @AMDEPBACKSLASH@
     985@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     986@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`
     987
     988orxonox-test_gun.o: world_entities/weapons/test_gun.cc
     989@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; \
     990@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
     991@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_gun.cc' object='orxonox-test_gun.o' libtool=no @AMDEPBACKSLASH@
     992@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
     993@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     994@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
     995
     996orxonox-test_gun.obj: world_entities/weapons/test_gun.cc
     997@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`; \
     998@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
     999@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_gun.cc' object='orxonox-test_gun.obj' libtool=no @AMDEPBACKSLASH@
     1000@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_gun.Po' tmpdepfile='$(DEPDIR)/orxonox-test_gun.TPo' @AMDEPBACKSLASH@
     1001@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1002@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`
     1003
     1004orxonox-test_bullet.o: world_entities/weapons/test_bullet.cc
     1005@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; \
     1006@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
     1007@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_bullet.cc' object='orxonox-test_bullet.o' libtool=no @AMDEPBACKSLASH@
     1008@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
     1009@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1010@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
     1011
     1012orxonox-test_bullet.obj: world_entities/weapons/test_bullet.cc
     1013@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`; \
     1014@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
     1015@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/test_bullet.cc' object='orxonox-test_bullet.obj' libtool=no @AMDEPBACKSLASH@
     1016@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-test_bullet.Po' tmpdepfile='$(DEPDIR)/orxonox-test_bullet.TPo' @AMDEPBACKSLASH@
     1017@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1018@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`
    10191019
    10201020orxonox-p_node.o: lib/coord/p_node.cc
    … …  
    13481348
    13491349distdir: $(DISTFILES)
    1350         $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1350        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
    13511351        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    13521352        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/defs/include_paths.am

    r4572 r4758  
    11AM_CXXFLAGS=-I$(MAINSRCDIR)
    22AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
     3AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities/weapons
    34AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
    45AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib

  • orxonox/trunk/src/lib/lang/class_list.cc

    r4756 r4758  
    152152  PRINT(0)("=  CLASS_LIST (level %d)  =\n", debugLevel);
    153153  PRINT(0)("==========================\n");
    154   PRINT(0)(" knows %d Classes\n\n", ClassList::classCount);
     154  PRINT(0)("| knows %d Classes\n\|\n", ClassList::classCount);
    155155  ClassList* tmp = ClassList::first;
    156156  char niceString[100];
    … …  
    168168      niceString[30-strlen(tmp->className) - lenCount] = '\0';
    169169
    170       PRINT(0)(" CLASS %s:%s %d\n", tmp->className, niceString, tmp->objectList->getSize());
     170      PRINT(0)("| CLASS %s:%s %d\n", tmp->className, niceString, tmp->objectList->getSize());
    171171
    172172      if (debugLevel >=2 && tmp->objectList->getSize() > 0)
    173173      {
    174         PRINT(0)("  Listing Instances:\n");
     174        PRINT(0)("|  Listing Instances:\n");
    175175        tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
    176176        BaseObject* enumBO = iterator->nextElement();
    177177        while (enumBO)
    178178        {
    179           PRINT(0)("   (class %s): NAME(%s)->%p\n", enumBO->getClassName(), enumBO->getName(), enumBO);
     179          PRINT(0)("|   (class %s): NAME(%s)->%p\n", enumBO->getClassName(), enumBO->getName(), enumBO);
    180180          enumBO = iterator->nextElement();
    181181        }
    … …  
    185185    tmp = tmp->next;
    186186  }
    187   PRINT(0)("==============CL=\n");
     187  PRINT(0)("=======================CL=\n");
    188188}
Note: See TracChangeset for help on using the changeset viewer.