Changeset 9900 for code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.cc

Timestamp:

Dec 16, 2013, 1:33:09 PM (10 years ago)

Author:

smerkli

Message:

Merged the invaders branch of Florian

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/ParticleEmitter.cc (modified) (1 diff)

code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.cc

@@ -45 +45 @@
     RegisterClass(ParticleEmitter);
 
-    ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)
+    ParticleEmitter::ParticleEmitter(Context* context) : MovableEntity(context)
     {
         RegisterObject(ParticleEmitter);