Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 8, 2009, 12:36:08 AM (16 years ago)
Author:
dafrick
Message:

Merging of the current QuestSystem branch.

Location:
code/branches/questsystem5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/questsystem5

  • code/branches/questsystem5/src/core/ObjectListIterator.h

    r2662 r2907  
    6565            {
    6666                this->element_ = 0;
    67                 this->iterator_ = ClassIdentifier<T>::getIdentifier()->getObjects()->registerObjectListIterator(this);
     67                ClassIdentifier<T>::getIdentifier()->getObjects()->registerObjectListIterator(this);
    6868            }
    6969
     
    7575            {
    7676                this->element_ = element;
    77                 this->iterator_ = ClassIdentifier<T>::getIdentifier()->getObjects()->registerObjectListIterator(this);
     77                ClassIdentifier<T>::getIdentifier()->getObjects()->registerObjectListIterator(this);
    7878            }
    7979
     
    8585            {
    8686                this->element_ = other.element_;
    87                 this->iterator_ = ClassIdentifier<T>::getIdentifier()->getObjects()->registerObjectListIterator(this);
     87                ClassIdentifier<T>::getIdentifier()->getObjects()->registerObjectListIterator(this);
    8888            }
    8989
     
    9393            inline ~ObjectListIterator()
    9494            {
    95                 ClassIdentifier<T>::getIdentifier()->getObjects()->unregisterObjectListIterator(this->iterator_);
     95                ClassIdentifier<T>::getIdentifier()->getObjects()->unregisterObjectListIterator(this);
    9696            }
    9797
     
    227227        private:
    228228            ObjectListElement<T>* element_;        //!< The element the Iterator points at
    229             std::list<void*>::iterator iterator_;  //!< The iterator in the notifying list of the ObjectList
    230229    };
    231230}
Note: See TracChangeset for help on using the changeset viewer.