From 8441dcfa2a368cfa830405238f312e921697e276 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 7 Jan 2016 18:07:03 +0100 Subject: [PATCH] Ndk/Console: Fix compilation Former-commit-id: 3579cc6a392f1e74134e035192c5ecdd3e779266 --- SDK/include/NDK/Console.hpp | 7 ++++--- SDK/include/NDK/Console.inl | 15 ++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/SDK/include/NDK/Console.hpp b/SDK/include/NDK/Console.hpp index b594c1179..1f0d36930 100644 --- a/SDK/include/NDK/Console.hpp +++ b/SDK/include/NDK/Console.hpp @@ -32,10 +32,11 @@ namespace Ndk void AddLine(const Nz::String& text, const Nz::Color& color = Nz::Color::White); - inline const EntityHandle& GetBackground() const; inline unsigned int GetCharacterSize() const; inline const EntityHandle& GetHistory() const; + inline const EntityHandle& GetHistoryBackground() const; inline const EntityHandle& GetInput() const; + inline const EntityHandle& GetInputBackground() const; inline const Nz::Vector2f& GetSize() const; inline const Nz::FontRef& GetTextFont() const; @@ -65,13 +66,13 @@ namespace Ndk }; std::vector m_historyLines; - EntityOwner m_background; + EntityOwner m_historyBackground; EntityOwner m_history; EntityOwner m_input; EntityOwner m_inputBackground; Nz::FontRef m_defaultFont; Nz::LuaInstance& m_instance; - Nz::SpriteRef m_backgroundSprite; + Nz::SpriteRef m_historyBackgroundSprite; Nz::SpriteRef m_inputBackgroundSprite; Nz::SimpleTextDrawer m_historyDrawer; Nz::SimpleTextDrawer m_inputDrawer; diff --git a/SDK/include/NDK/Console.inl b/SDK/include/NDK/Console.inl index d4c3d5e2d..5fb16bb1b 100644 --- a/SDK/include/NDK/Console.inl +++ b/SDK/include/NDK/Console.inl @@ -7,11 +7,6 @@ namespace Ndk { - inline const EntityHandle& Console::GetBackground() const - { - return m_background; - } - inline unsigned int Console::GetCharacterSize() const { return m_characterSize; @@ -22,11 +17,21 @@ namespace Ndk return m_history; } + inline const EntityHandle& Console::GetHistoryBackground() const + { + return m_historyBackground; + } + inline const EntityHandle& Console::GetInput() const { return m_input; } + inline const EntityHandle& Console::GetInputBackground() const + { + return m_inputBackground; + } + inline const Nz::Vector2f& Console::GetSize() const { return m_size;