Changeset 6424 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Jan 7, 2006, 11:07:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

File:

• trunk/src/Makefile.am (modified) (2 diffs)

trunk/src/Makefile.am

@@ -48 +48 @@
                   story_entities/story_entity.cc \
                   story_entities/campaign.cc \
-                  story_entities/world.cc \
-                  story_entities/network_world.cc \
+                  story_entities/campaign_data.cc \
+                  story_entities/game_world.cc \
+                  story_entities/game_world_data.cc \
+                  story_entities/single_player_world.cc \
+                  story_entities/single_player_world_data.cc \
+                  story_entities/multi_player_world.cc \
+                  story_entities/multi_player_world_data.cc \
                   world_entities/world_entity.cc \
                   world_entities/camera.cc \
@@ -96 +101 @@
                  story_entities/story_def.h \
                  story_entities/campaign.h \
-                 story_entities/world.h \
-                 story_entities/network_world.h \
+                 story_entities/campaign_data.h \
+                 story_entities/game_world.h \
+                 story_entities/game_world_data.h \
+                 story_entities/single_player_world.h \
+                 story_entities/single_player_world_data.h \
+                 story_entities/multi_player_world.h \
+                 story_entities/multi_player_world_data.h \
                  world_entities/world_entity.h \
                  world_entities/camera.h \