Changeset 9869 in orxonox.OLD for trunk/src/world_entities/projectiles/projectile.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/projectiles/projectile.h (modified) (3 diffs)

trunk/src/world_entities/projectiles/projectile.h

@@ -11 +11 @@
 
 #include "world_entity.h"
-#include "fast_factory.h"
+#include "loading/fast_factory.h"
 
 #include "sound_source.h"
@@ -18 +18 @@
 class Projectile : public WorldEntity
 {
+  ObjectListDeclaration(Projectile);
   public:
     Projectile ();
@@ -66 +67 @@
     OrxSound::SoundSource  soundSource;
   private:
-    OrxSound::SoundBuffer* explosionBuffer;
-    OrxSound::SoundBuffer* engineBuffer;
+    OrxSound::SoundBuffer  explosionBuffer;
+    OrxSound::SoundBuffer  engineBuffer;
 };