Changeset 4301 in orxonox.OLD for orxonox/branches/physics/src/story_entities/world.cc

Timestamp:

May 26, 2005, 3:20:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

File:

• orxonox/branches/physics/src/story_entities/world.cc (modified) (2 diffs)

orxonox/branches/physics/src/story_entities/world.cc

@@ -42 +42 @@
 #include "track_manager.h"
 #include "garbage_collector.h"
+#include "object_manager.h"
 #include "animation_player.h"
 #include "particle_engine.h"
@@ -58 +59 @@
 
 #include "factory.h"
+
+#include "projectile.h"
 
 using namespace std;