diff options
| author | Eugene Sandulenko | 2010-08-06 14:38:08 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:36:30 +0000 |
| commit | 7257ee345b9c71e0aa0677061de0a0466c183cb9 (patch) | |
| tree | fd254b07f13f2dc01bebb4a32aceea8946b587f7 /engines/sword25/gfx/renderobject.cpp | |
| parent | 47904bc7b2992189bb554833f00a79ff0fea9fb8 (diff) | |
| download | scummvm-rg350-7257ee345b9c71e0aa0677061de0a0466c183cb9.tar.gz scummvm-rg350-7257ee345b9c71e0aa0677061de0a0466c183cb9.tar.bz2 scummvm-rg350-7257ee345b9c71e0aa0677061de0a0466c183cb9.zip | |
SWORD25: More compilation fixes
svn-id: r53223
Diffstat (limited to 'engines/sword25/gfx/renderobject.cpp')
| -rw-r--r-- | engines/sword25/gfx/renderobject.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sword25/gfx/renderobject.cpp b/engines/sword25/gfx/renderobject.cpp index af70a4a047..8be0dfb380 100644 --- a/engines/sword25/gfx/renderobject.cpp +++ b/engines/sword25/gfx/renderobject.cpp @@ -84,7 +84,7 @@ BS_RenderObject::BS_RenderObject(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, // selben RenderObjektManager zuweisen. if (m_ParentPtr.IsValid()) { m_ManagerPtr = m_ParentPtr->GetManager(); - m_ParentPtr->AddObject(this); + m_ParentPtr->AddObject(this->GetHandle()); } else { if (GetType() != TYPE_ROOT) { BS_LOG_ERRORLN("Tried to create a non-root render object and has no parent. All non-root render objects have to have a parent."); @@ -99,7 +99,7 @@ BS_RenderObject::BS_RenderObject(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, BS_RenderObject::~BS_RenderObject() { // Objekt aus dem Elternobjekt entfernen. - if (m_ParentPtr.IsValid()) m_ParentPtr->DetatchChildren(this); + if (m_ParentPtr.IsValid()) m_ParentPtr->DetatchChildren(this->GetHandle()); DeleteAllChildren(); @@ -128,7 +128,8 @@ bool BS_RenderObject::Render() { // Dann müssen die Kinder gezeichnet werden RENDEROBJECT_ITER it = m_Children.begin(); for (; it != m_Children.end(); ++it) - if (!(*it)->Render()) return false; + if (!(*it)->Render()) + return false; return true; } @@ -251,7 +252,7 @@ bool BS_RenderObject::DetatchChildren(BS_RenderObjectPtr<BS_RenderObject> pObjec } void BS_RenderObject::SortRenderObjects() { - std::sort(m_Children.begin(), m_Children.end(), Greater); + Common::sort(m_Children.begin(), m_Children.end(), Greater); } void BS_RenderObject::UpdateAbsolutePos() { @@ -363,7 +364,7 @@ BS_RenderObjectPtr<BS_Panel> BS_RenderObject::AddPanel(int Width, int Height, un // ----------------------------------------------------------------------------- -BS_RenderObjectPtr<BS_Text> BS_RenderObject::AddText(const Common::String &Font, const std::string &Text) { +BS_RenderObjectPtr<BS_Text> BS_RenderObject::AddText(const Common::String &Font, const Common::String &Text) { BS_RenderObjectPtr<BS_Text> TextPtr(new BS_Text(this)); if (TextPtr.IsValid() && TextPtr->GetInitSuccess() && TextPtr->SetFont(Font)) { TextPtr->SetText(Text); |