diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-30 12:53:41 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-30 12:57:12 +0400 |
commit | 6ab3a2f8a454aa47e4d64b6d1320dfc0c16546df (patch) | |
tree | 16af401c50fa7b8f668f48a2fa3fe5dc8ba6ea1f /source/gameengine | |
parent | 7829ef0051a16c1af88f72d99c329f5c75dd3eea (diff) |
Change naming slightly, it conflicts with DrawText function define on
windows on MinGW
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/KX_FontObject.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_FontObject.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index a0266a54411..9789a8294ee 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -166,7 +166,7 @@ int GetFontId(VFont *vfont) return fontid; } -void KX_FontObject::DrawText() +void KX_FontObject::DrawFontText() { /* Allow for some logic brick control */ if (this->GetProperty("Text")) diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h index 8b66accb797..209ab6ca69f 100644 --- a/source/gameengine/Ketsji/KX_FontObject.h +++ b/source/gameengine/Ketsji/KX_FontObject.h @@ -45,7 +45,7 @@ public: virtual ~KX_FontObject(); - void DrawText(); + void DrawFontText(); /** * Inherited from CValue -- return a new copy of this diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 4ed5d83a2b7..65f5ff15501 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1742,7 +1742,7 @@ void KX_Scene::RenderFonts() { list<KX_FontObject*>::iterator it = m_fonts.begin(); while (it != m_fonts.end()) { - (*it)->DrawText(); + (*it)->DrawFontText(); ++it; } } |