Changeset 9869 in orxonox.OLD for trunk/src/world_entities/power_ups/power_up.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/power_ups/power_up.h (modified) (2 diffs)

trunk/src/world_entities/power_ups/power_up.h

@@ -21 +21 @@
 
 class PowerUp : public WorldEntity {
+  ObjectListDeclaration(PowerUp);
 
 public:
@@ -43 +44 @@
 private:
   OrxSound::SoundSource  soundSource;
-  OrxSound::SoundBuffer* pickupBuffer;
-  OrxSound::SoundBuffer* respawnBuffer;
+  OrxSound::SoundBuffer  pickupBuffer;
+  OrxSound::SoundBuffer  respawnBuffer;
   Material*              sphereMaterial;
   PowerUpRespawn         respawnType;