ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't return pointer to temporary object

Browse Source
This commit is contained in:
Marianne Gagnon
2014-01-22 19:03:55 -05:00
parent 1e721906e7
commit 583092bbf8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tracks/track_object.cpp
View File

@@ -282,7 +282,7 @@ const core::vector3df& TrackObject::getPosition() const
// ----------------------------------------------------------------------------
const core::vector3df& TrackObject::getAbsolutePosition() const
const core::vector3df TrackObject::getAbsolutePosition() const
{
if (m_presentation != NULL)
return m_presentation->getAbsolutePosition();

2
src/tracks/track_object.hpp
View File

@@ -133,7 +133,7 @@ public:
const ThreeDAnimation* getAnimator() const { return m_animator; }
const core::vector3df& getPosition() const;
const core::vector3df& getAbsolutePosition() const;
const core::vector3df getAbsolutePosition() const;
const core::vector3df& getRotation() const;
const core::vector3df& getScale() const;

2
src/tracks/track_object_presentation.cpp
View File

@@ -71,7 +71,7 @@ const core::vector3df& TrackObjectPresentationSceneNode::getPosition() const
return m_node->getPosition();
}
const core::vector3df& TrackObjectPresentationSceneNode::getAbsolutePosition() const
const core::vector3df TrackObjectPresentationSceneNode::getAbsolutePosition() const
{
if (m_node == NULL) return m_init_xyz;
m_node->updateAbsolutePosition();

4
src/tracks/track_object_presentation.hpp
View File

@@ -82,7 +82,7 @@ public:
const core::vector3df& scale) {}
virtual const core::vector3df& getPosition() const { return m_init_xyz; }
virtual const core::vector3df& getAbsolutePosition() const { return m_init_xyz; }
virtual const core::vector3df getAbsolutePosition() const { return m_init_xyz; }
virtual const core::vector3df& getRotation() const { return m_init_hpr; }
virtual const core::vector3df& getScale() const { return m_init_scale; }
@@ -116,7 +116,7 @@ public:
}
virtual const core::vector3df& getPosition() const OVERRIDE;
virtual const core::vector3df& getAbsolutePosition() const OVERRIDE;
virtual const core::vector3df getAbsolutePosition() const OVERRIDE;
virtual const core::vector3df& getRotation() const OVERRIDE;
virtual const core::vector3df& getScale() const OVERRIDE;
virtual void move(const core::vector3df& xyz, const core::vector3df& hpr,