Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5685 in orxonox.OLD for branches


Ignore:
Timestamp:
Nov 21, 2005, 10:37:57 PM (19 years ago)
Author:
bensch
Message:

orxonox/world_entities: world_entities are in a seperate Directory now

Location:
branches/world_entities/src
Files:
2 added
4 edited
5 moved

Legend:

Unmodified
Added
Removed

  • branches/world_entities/src/Makefile.am

    r5682 r5685  
    4848                  world_entities/camera.cc \
    4949                  world_entities/player.cc \
    50                   world_entities/npc.cc \
    51                   world_entities/npc_test1.cc \
    52                   world_entities/npc_test.cc \
     50                  world_entities/npcs/npc.cc \
     51                  world_entities/npcs/npc_test1.cc \
     52                  world_entities/npcs/npc_test.cc \
    5353                  world_entities/environment.cc \
    5454                  world_entities/skysphere.cc \
    … …  
    6363                  world_entities/weapons/test_gun.cc \
    6464                  world_entities/weapons/turret.cc \
    65                   world_entities/weapons/ground_turret.cc \
     65                  world_entities/weapons/ground_turret.cc \
    6666                  world_entities/weapons/aiming_turret.cc \
    6767                  world_entities/weapons/cannon.cc \
    … …  
    8787                 world_entities/camera.h \
    8888                 world_entities/player.h \
    89                  world_entities/npc.h \
    90                  world_entities/npc_test1.h \
     89                 world_entities/npcs/npc.h \
     90                 world_entities/npcs/npc_test.h \
     91                 world_entities/npcs/npc_test1.h \
    9192                 world_entities/environment.h \
    9293                 world_entities/skysphere.h \

  • branches/world_entities/src/Makefile.in

    r5682 r5685  
    245245                  world_entities/camera.cc \
    246246                  world_entities/player.cc \
    247                   world_entities/npc.cc \
    248                   world_entities/npc_test1.cc \
    249                   world_entities/npc_test.cc \
     247                  world_entities/npcs/npc.cc \
     248                  world_entities/npcs/npc_test1.cc \
     249                  world_entities/npcs/npc_test.cc \
    250250                  world_entities/environment.cc \
    251251                  world_entities/skysphere.cc \
    … …  
    260260                  world_entities/weapons/test_gun.cc \
    261261                  world_entities/weapons/turret.cc \
    262                   world_entities/weapons/ground_turret.cc \
     262                  world_entities/weapons/ground_turret.cc \
    263263                  world_entities/weapons/aiming_turret.cc \
    264264                  world_entities/weapons/cannon.cc \
    … …  
    284284                 world_entities/camera.h \
    285285                 world_entities/player.h \
    286                  world_entities/npc.h \
    287                  world_entities/npc_test1.h \
     286                 world_entities/npcs/npc.h \
     287                 world_entities/npcs/npc_test.h \
     288                 world_entities/npcs/npc_test1.h \
    288289                 world_entities/environment.h \
    289290                 world_entities/skysphere.h \
    … …  
    553554@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`
    554555
    555 orxonox-npc.o: world_entities/npc.cc
    556 @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; \
     556orxonox-npc.o: world_entities/npcs/npc.cc
     557@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/npcs/npc.cc' || echo '$(srcdir)/'`world_entities/npcs/npc.cc; \
    557558@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
    558 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.o' libtool=no @AMDEPBACKSLASH@
    559 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    560 @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
    561 
    562 orxonox-npc.obj: world_entities/npc.cc
    563 @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`; \
     559@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc.cc' object='orxonox-npc.o' libtool=no @AMDEPBACKSLASH@
     560@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     561@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.o `test -f 'world_entities/npcs/npc.cc' || echo '$(srcdir)/'`world_entities/npcs/npc.cc
     562
     563orxonox-npc.obj: world_entities/npcs/npc.cc
     564@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/npcs/npc.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc.cc'; fi`; \
    564565@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
    565 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.obj' libtool=no @AMDEPBACKSLASH@
    566 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    567 @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`
    568 
    569 orxonox-npc_test1.o: world_entities/npc_test1.cc
    570 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test1.o -MD -MP -MF "$(DEPDIR)/orxonox-npc_test1.Tpo" -c -o orxonox-npc_test1.o `test -f 'world_entities/npc_test1.cc' || echo '$(srcdir)/'`world_entities/npc_test1.cc; \
     566@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc.cc' object='orxonox-npc.obj' libtool=no @AMDEPBACKSLASH@
     567@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     568@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.obj `if test -f 'world_entities/npcs/npc.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc.cc'; fi`
     569
     570orxonox-npc_test1.o: world_entities/npcs/npc_test1.cc
     571@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test1.o -MD -MP -MF "$(DEPDIR)/orxonox-npc_test1.Tpo" -c -o orxonox-npc_test1.o `test -f 'world_entities/npcs/npc_test1.cc' || echo '$(srcdir)/'`world_entities/npcs/npc_test1.cc; \
    571572@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc_test1.Tpo" "$(DEPDIR)/orxonox-npc_test1.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test1.Tpo"; exit 1; fi
    572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test1.cc' object='orxonox-npc_test1.o' libtool=no @AMDEPBACKSLASH@
    573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    574 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test1.o `test -f 'world_entities/npc_test1.cc' || echo '$(srcdir)/'`world_entities/npc_test1.cc
    575 
    576 orxonox-npc_test1.obj: world_entities/npc_test1.cc
    577 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test1.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc_test1.Tpo" -c -o orxonox-npc_test1.obj `if test -f 'world_entities/npc_test1.cc'; then $(CYGPATH_W) 'world_entities/npc_test1.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test1.cc'; fi`; \
     573@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test1.cc' object='orxonox-npc_test1.o' libtool=no @AMDEPBACKSLASH@
     574@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     575@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test1.o `test -f 'world_entities/npcs/npc_test1.cc' || echo '$(srcdir)/'`world_entities/npcs/npc_test1.cc
     576
     577orxonox-npc_test1.obj: world_entities/npcs/npc_test1.cc
     578@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test1.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc_test1.Tpo" -c -o orxonox-npc_test1.obj `if test -f 'world_entities/npcs/npc_test1.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc_test1.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc_test1.cc'; fi`; \
    578579@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc_test1.Tpo" "$(DEPDIR)/orxonox-npc_test1.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test1.Tpo"; exit 1; fi
    579 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test1.cc' object='orxonox-npc_test1.obj' libtool=no @AMDEPBACKSLASH@
    580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    581 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test1.obj `if test -f 'world_entities/npc_test1.cc'; then $(CYGPATH_W) 'world_entities/npc_test1.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test1.cc'; fi`
    582 
    583 orxonox-npc_test.o: world_entities/npc_test.cc
    584 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test.o -MD -MP -MF "$(DEPDIR)/orxonox-npc_test.Tpo" -c -o orxonox-npc_test.o `test -f 'world_entities/npc_test.cc' || echo '$(srcdir)/'`world_entities/npc_test.cc; \
     580@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test1.cc' object='orxonox-npc_test1.obj' libtool=no @AMDEPBACKSLASH@
     581@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     582@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test1.obj `if test -f 'world_entities/npcs/npc_test1.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc_test1.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc_test1.cc'; fi`
     583
     584orxonox-npc_test.o: world_entities/npcs/npc_test.cc
     585@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test.o -MD -MP -MF "$(DEPDIR)/orxonox-npc_test.Tpo" -c -o orxonox-npc_test.o `test -f 'world_entities/npcs/npc_test.cc' || echo '$(srcdir)/'`world_entities/npcs/npc_test.cc; \
    585586@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc_test.Tpo" "$(DEPDIR)/orxonox-npc_test.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test.Tpo"; exit 1; fi
    586 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test.cc' object='orxonox-npc_test.o' libtool=no @AMDEPBACKSLASH@
    587 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    588 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test.o `test -f 'world_entities/npc_test.cc' || echo '$(srcdir)/'`world_entities/npc_test.cc
    589 
    590 orxonox-npc_test.obj: world_entities/npc_test.cc
    591 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc_test.Tpo" -c -o orxonox-npc_test.obj `if test -f 'world_entities/npc_test.cc'; then $(CYGPATH_W) 'world_entities/npc_test.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test.cc'; fi`; \
     587@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test.cc' object='orxonox-npc_test.o' libtool=no @AMDEPBACKSLASH@
     588@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     589@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test.o `test -f 'world_entities/npcs/npc_test.cc' || echo '$(srcdir)/'`world_entities/npcs/npc_test.cc
     590
     591orxonox-npc_test.obj: world_entities/npcs/npc_test.cc
     592@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc_test.Tpo" -c -o orxonox-npc_test.obj `if test -f 'world_entities/npcs/npc_test.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc_test.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc_test.cc'; fi`; \
    592593@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc_test.Tpo" "$(DEPDIR)/orxonox-npc_test.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test.Tpo"; exit 1; fi
    593 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test.cc' object='orxonox-npc_test.obj' libtool=no @AMDEPBACKSLASH@
    594 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    595 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test.obj `if test -f 'world_entities/npc_test.cc'; then $(CYGPATH_W) 'world_entities/npc_test.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test.cc'; fi`
     594@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test.cc' object='orxonox-npc_test.obj' libtool=no @AMDEPBACKSLASH@
     595@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     596@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test.obj `if test -f 'world_entities/npcs/npc_test.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc_test.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc_test.cc'; fi`
    596597
    597598orxonox-environment.o: world_entities/environment.cc
    … …  
    10791080
    10801081distdir: $(DISTFILES)
    1081         $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
     1082        $(mkdir_p) $(distdir)/defs $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/world_entities $(distdir)/world_entities/npcs $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
    10821083        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    10831084        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • branches/world_entities/src/story_entities/world.cc

    r5682 r5685  
    7070
    7171#include "cd_engine.h"
    72 #include "npc_test1.h"
     72#include "npcs/npc_test1.h"
    7373#include "shader.h"
    7474

  • branches/world_entities/src/world_entities/weapons/ground_turret.h

    r5681 r5685  
    77#define _GROUND_TURRET_H
    88
    9 #include "npc.h"
     9#include "npcs/npc.h"
    1010
    1111//! A Class to ...
Note: See TracChangeset for help on using the changeset viewer.