Changeset 9808 in orxonox.OLD

Timestamp:

Sep 25, 2006, 12:39:24 AM (18 years ago)

Author:

bensch

Message:

fixed a copy bug… wow… this took 2 hours again

Location:

branches/new_class_id/src

Files:

• lib/sound/sound_buffer.h (modified) (1 diff)
• lib/util/count_pointer.h (modified) (2 diffs)
• lib/util/loading/fast_factory.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (1 diff)

branches/new_class_id/src/lib/sound/sound_buffer.h

@@ -23 +23 @@
     virtual ~SoundBuffer();
 
+    /** @brief assignment operator */
+    SoundBuffer& operator=(const SoundBuffer& buffer) { this->data = buffer.data; return *this; };
     bool operator==(const SoundBuffer& buffer) const {return this->data == buffer.data; };
 

branches/new_class_id/src/lib/util/count_pointer.h

@@ -11 +11 @@
   explicit CountPointer(X* p = NULL) // allocate a new counter
       : itsCounter(NULL) { if (p) itsCounter = new counter(p); }
-virtual ~CountPointer() { release(); }
+  ~CountPointer() { release(); }
   CountPointer(const CountPointer& r) { acquire(r.itsCounter); }
   CountPointer& operator=(const CountPointer& r)
@@ -25 +25 @@
   inline X& operator*()  const { return *itsCounter->ptr; }
   inline X* operator->() const { return itsCounter->ptr; }
-inline bool unique()   const { return (itsCounter ? itsCounter->count == 1 : true); }
+  inline bool unique()   const { return (itsCounter ? itsCounter->count == 1 : true); }
   inline bool isNull()   const { return (!itsCounter); }
 
-virtual unsigned int count() const { return (this->itsCounter ? itsCounter->count : 0); }
+  unsigned int count() const { return (this->itsCounter ? itsCounter->count : 0); }
 private:
 

branches/new_class_id/src/lib/util/loading/fast_factory.cc

@@ -164 +164 @@
     tmpMember = tmpMember->next;
     if (hardFLUSH)
-    {
       delete delMember->objectPointer;
-    }
     delete delMember;
   }

branches/new_class_id/src/world_entities/npcs/generic_npc.cc

@@ -27 +27 @@
 
 #include "sound_buffer.h"
+#include "resource_sound_buffer.h"
 
 #include "loading/resource_manager.h"