Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / guiChatConsole.cpp

diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
index 0101b99bb136b131c16029ea4ceae033830a0544..3dfd0090a6c6b224898b06ed678ec41269f33eb8 100644 (file)
--- a/src/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -32,6 +32,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "gettext.h"
 
+#if USE_FREETYPE
+#include "xCGUITTFont.h"
+#endif
+
 inline u32 clamp_u8(s32 value)
 {
        return (u32) MYMIN(MYMAX(value, 0), 255);
@@ -90,8 +94,14 @@ GUIChatConsole::GUIChatConsole(
 
        // load the font
        // FIXME should a custom texture_path be searched too?
+       #if USE_FREETYPE
+       std::string font_name = g_settings->get("mono_font_path");
+       u16 font_size = g_settings->getU16("mono_font_size");
+       m_font = gui::CGUITTFont::createTTFont(env, font_name.c_str(), font_size);
+       #else
        std::string font_name = "fontdejavusansmono.png";
        m_font = env->getFont(getTexturePath(font_name).c_str());
+       #endif
        if (m_font == NULL)
        {
                dstream << "Unable to load font: " << font_name << std::endl;
@@ -111,6 +121,9 @@ GUIChatConsole::GUIChatConsole(
 
 GUIChatConsole::~GUIChatConsole()
 {
+#if USE_FREETYPE
+       m_font->drop();
+#endif
 }
 
 void GUIChatConsole::openConsole(f32 height)
@@ -525,7 +538,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
                {
                        // Tab or Shift-Tab pressed
                        // Nick completion
-                       core::list<std::wstring> names = m_client->getConnectedPlayerNames();
+                       std::list<std::string> names = m_client->getConnectedPlayerNames();
                        bool backwards = event.KeyInput.Shift;
                        m_chat_backend->getPrompt().nickCompletion(names, backwards);
                        return true;