Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9808 in orxonox.OLD for branches/new_class_id/src


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/sound/sound_buffer.h

    r9806 r9808  
    2323    virtual ~SoundBuffer();
    2424
     25    /** @brief assignment operator */
     26    SoundBuffer& operator=(const SoundBuffer& buffer) { this->data = buffer.data; return *this; };
    2527    bool operator==(const SoundBuffer& buffer) const {return this->data == buffer.data; };
    2628
  • branches/new_class_id/src/lib/util/count_pointer.h

    r9723 r9808  
    1111  explicit CountPointer(X* p = NULL) // allocate a new counter
    1212      : itsCounter(NULL) { if (p) itsCounter = new counter(p); }
    13 virtual ~CountPointer() { release(); }
     13  ~CountPointer() { release(); }
    1414  CountPointer(const CountPointer& r) { acquire(r.itsCounter); }
    1515  CountPointer& operator=(const CountPointer& r)
     
    2525  inline X& operator*()  const { return *itsCounter->ptr; }
    2626  inline X* operator->() const { return itsCounter->ptr; }
    27 inline bool unique()   const { return (itsCounter ? itsCounter->count == 1 : true); }
     27  inline bool unique()   const { return (itsCounter ? itsCounter->count == 1 : true); }
    2828  inline bool isNull()   const { return (!itsCounter); }
    2929
    30 virtual unsigned int count() const { return (this->itsCounter ? itsCounter->count : 0); }
     30  unsigned int count() const { return (this->itsCounter ? itsCounter->count : 0); }
    3131private:
    3232
  • branches/new_class_id/src/lib/util/loading/fast_factory.cc

    r9715 r9808  
    164164    tmpMember = tmpMember->next;
    165165    if (hardFLUSH)
    166     {
    167166      delete delMember->objectPointer;
    168     }
    169167    delete delMember;
    170168  }
  • branches/new_class_id/src/world_entities/npcs/generic_npc.cc

    r9806 r9808  
    2727
    2828#include "sound_buffer.h"
     29#include "resource_sound_buffer.h"
    2930
    3031#include "loading/resource_manager.h"
Note: See TracChangeset for help on using the changeset viewer.