Changeset 9869 in orxonox.OLD for trunk/src/world_entities/npcs/generic_npc.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 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/npcs/generic_npc.h (modified) (2 diffs)

trunk/src/world_entities/npcs/generic_npc.h

@@ -25 +25 @@
 class GenericNPC : public NPC
 {
+  ObjectListDeclaration(GenericNPC);
 
 
@@ -123 +124 @@
 
    OrxSound::SoundSource                   soundSource;
-   OrxSound::SoundBuffer*                  soundBuffer;
+   OrxSound::SoundBuffer                   soundBuffer;
    float                                   soundVolume;