Changeset 5685 in orxonox.OLD for branches/world_entities

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:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (5 diffs)
• story_entities/world.cc (modified) (1 diff)
• world_entities/npcs (added)
• world_entities/npcs/npc.cc (moved) (moved from branches/world_entities/src/world_entities/npc.cc)
• world_entities/npcs/npc.h (moved) (moved from branches/world_entities/src/world_entities/npc.h)
• world_entities/npcs/npc_test.cc (moved) (moved from branches/world_entities/src/world_entities/npc_test.cc)
• world_entities/npcs/npc_test.h (moved) (moved from branches/world_entities/src/world_entities/npc_test.h)
• world_entities/npcs/npc_test1.cc (moved) (moved from branches/world_entities/src/world_entities/npc_test1.cc)
• world_entities/npcs/npc_test1.h (added)
• world_entities/weapons/ground_turret.h (modified) (1 diff)

branches/world_entities/src/Makefile.am

@@ -48 +48 @@
                   world_entities/camera.cc \
                   world_entities/player.cc \
-                  world_entities/npc.cc \
-                  world_entities/npc_test1.cc \
-                  world_entities/npc_test.cc \
+                  world_entities/npcs/npc.cc \
+                  world_entities/npcs/npc_test1.cc \
+                  world_entities/npcs/npc_test.cc \
                   world_entities/environment.cc \
                   world_entities/skysphere.cc \
@@ -63 +63 @@
                   world_entities/weapons/test_gun.cc \
                   world_entities/weapons/turret.cc \
-                  world_entities/weapons/ground_turret.cc \
+                  world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
                   world_entities/weapons/cannon.cc \
@@ -87 +87 @@
                  world_entities/camera.h \
                  world_entities/player.h \
-                 world_entities/npc.h \
-                 world_entities/npc_test1.h \
+                 world_entities/npcs/npc.h \
+                 world_entities/npcs/npc_test.h \
+                 world_entities/npcs/npc_test1.h \
                  world_entities/environment.h \
                  world_entities/skysphere.h \

branches/world_entities/src/Makefile.in

@@ -245 +245 @@
                   world_entities/camera.cc \
                   world_entities/player.cc \
-                  world_entities/npc.cc \
-                  world_entities/npc_test1.cc \
-                  world_entities/npc_test.cc \
+                  world_entities/npcs/npc.cc \
+                  world_entities/npcs/npc_test1.cc \
+                  world_entities/npcs/npc_test.cc \
                   world_entities/environment.cc \
                   world_entities/skysphere.cc \
@@ -260 +260 @@
                   world_entities/weapons/test_gun.cc \
                   world_entities/weapons/turret.cc \
-                  world_entities/weapons/ground_turret.cc \
+                  world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
                   world_entities/weapons/cannon.cc \
@@ -284 +284 @@
                  world_entities/camera.h \
                  world_entities/player.h \
-                 world_entities/npc.h \
-                 world_entities/npc_test1.h \
+                 world_entities/npcs/npc.h \
+                 world_entities/npcs/npc_test.h \
+                 world_entities/npcs/npc_test1.h \
                  world_entities/environment.h \
                  world_entities/skysphere.h \
@@ -553 +554 @@
 @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; \
+orxonox-npc.o: world_entities/npcs/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/npcs/npc.cc' || echo '$(srcdir)/'`world_entities/npcs/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@      DEPDIR=$(DEPDIR) $(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`; \
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc.cc' object='orxonox-npc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(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/npcs/npc.cc' || echo '$(srcdir)/'`world_entities/npcs/npc.cc
+
+orxonox-npc.obj: world_entities/npcs/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/npcs/npc.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/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@      DEPDIR=$(DEPDIR) $(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-npc_test1.o: world_entities/npc_test1.cc
-@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; \
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc.cc' object='orxonox-npc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(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/npcs/npc.cc'; then $(CYGPATH_W) 'world_entities/npcs/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npcs/npc.cc'; fi`
+
+orxonox-npc_test1.o: world_entities/npcs/npc_test1.cc
+@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; \
 @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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test1.cc' object='orxonox-npc_test1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
-orxonox-npc_test1.obj: world_entities/npc_test1.cc
-@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`; \
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test1.cc' object='orxonox-npc_test1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+orxonox-npc_test1.obj: world_entities/npcs/npc_test1.cc
+@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`; \
 @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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test1.cc' object='orxonox-npc_test1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
-
-orxonox-npc_test.o: world_entities/npc_test.cc
-@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; \
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test1.cc' object='orxonox-npc_test1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+orxonox-npc_test.o: world_entities/npcs/npc_test.cc
+@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; \
 @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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test.cc' object='orxonox-npc_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
-orxonox-npc_test.obj: world_entities/npc_test.cc
-@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`; \
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test.cc' object='orxonox-npc_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+orxonox-npc_test.obj: world_entities/npcs/npc_test.cc
+@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`; \
 @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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc_test.cc' object='orxonox-npc_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npcs/npc_test.cc' object='orxonox-npc_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
 
 orxonox-environment.o: world_entities/environment.cc
@@ -1079 +1080 @@
 
 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 $(distdir)/world_entities $(distdir)/world_entities/npcs $(distdir)/world_entities/power_ups $(distdir)/world_entities/weapons
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

branches/world_entities/src/story_entities/world.cc

@@ -70 +70 @@
 
 #include "cd_engine.h"
-#include "npc_test1.h"
+#include "npcs/npc_test1.h"
 #include "shader.h"
 

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

@@ -7 +7 @@
 #define _GROUND_TURRET_H
 
-#include "npc.h"
+#include "npcs/npc.h"
 
 //! A Class to ...