Changeset 7016 in orxonox.OLD

Timestamp:

Feb 3, 2006, 3:04:03 PM (18 years ago)

Author:

bensch

Message:

moved ImageEntity

Location:

trunk/src

Files:

• story_entities/simple_game_menu.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (4 diffs)
• world_entities/elements (added)
• world_entities/elements/image_entity.cc (moved) (moved from trunk/src/world_entities/image_entity.cc)
• world_entities/elements/image_entity.h (moved) (moved from trunk/src/world_entities/image_entity.h)

trunk/src/story_entities/simple_game_menu.cc

@@ -28 +28 @@
 #include "p_node.h"
 #include "world_entity.h"
-#include "image_entity.h"
+#include "elements/image_entity.h"
 #include "terrain.h"
 #include "camera.h"

trunk/src/world_entities/Makefile.am

@@ -24 +24 @@
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
-                  world_entities/image_entity.cc \
                   world_entities/planet.cc \
                   \
@@ -62 +61 @@
                   \
                   world_entities/environments/water.cc \
-                  world_entities/environments/model_entity.cc
+                  world_entities/environments/model_entity.cc \
+                  \
+                  world_entities/elements/image_entity.cc
+
 
 WorldEntities_HEADERS_ = \
@@ -82 +84 @@
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \
-                 world_entities/image_entity.h \
                  world_entities/planet.h \
                  \
@@ -118 +119 @@
                  \
                  world_entities/environments/water.h \
-                 world_entities/environments/model_entity.h
+                 world_entities/environments/model_entity.h \
+                 \
+                 world_entities/elements/image_entity.h
+