Changeset 5894 for code/branches/core5/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Oct 6, 2009, 6:58:10 PM (15 years ago)

Author:

landauf

Message:

Using SmartPtr for CameraPositions in ControllableEntity.
This fixes a crash when finishing the pong level, because the static top-down camera was attached to the PongCenter and therefore destroyed before before the PongBat.

File:

• code/branches/core5/src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/core5/src/orxonox/worldentities/ControllableEntity.h

@@ -104 +104 @@
             void addCameraPosition(CameraPosition* position);
             CameraPosition* getCameraPosition(unsigned int index) const;
-            inline const std::list<CameraPosition*>& getCameraPositions() const
+            inline const std::list<SmartPtr<CameraPosition> >& getCameraPositions() const
                 { return this->cameraPositions_; }
 
@@ -198 +198 @@
             float mouseLookSpeed_;
             Ogre::SceneNode* cameraPositionRootNode_;
-            std::list<CameraPosition*> cameraPositions_;
+            std::list<SmartPtr<CameraPosition> > cameraPositions_;
             std::string cameraPositionTemplate_;
             Controller* xmlcontroller_;