Make m_media_fetch_threads to contain MediaFetchThread* instead of MediaFetchThread

[minetest.git] / src / guiPauseMenu.cpp

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index e542a28e90ce63e1baed8637a483933715718b73..c800cf9529e76eb65657fe687bf8200dbe2b8dd8 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>\r
 \r
 This program is free software; you can redistribute it and/or modify\r
-it under the terms of the GNU General Public License as published by\r
-the Free Software Foundation; either version 2 of the License, or\r
+it under the terms of the GNU Lesser General Public License as published by\r
+the Free Software Foundation; either version 2.1 of the License, or\r
 (at your option) any later version.\r
 \r
 This program is distributed in the hope that it will be useful,\r
 but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-GNU General Public License for more details.\r
+GNU Lesser General Public License for more details.\r
 \r
-You should have received a copy of the GNU General Public License along\r
+You should have received a copy of the GNU Lesser General Public License along\r
 with this program; if not, write to the Free Software Foundation, Inc.,\r
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 */\r
@@ -28,8 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIButton.h>\r
 #include <IGUIStaticText.h>\r
 #include <IGUIFont.h>\r
-\r
 #include "gettext.h"\r
+#include "util/string.h"\r
 \r
 GUIPauseMenu::GUIPauseMenu(gui::IGUIEnvironment* env,\r
                gui::IGUIElement* parent, s32 id,\r
@@ -169,23 +169,8 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
                        max_texture_size = driver->getMaxTextureSize();\r
                }\r
 \r
-               /*wchar_t text[200];\r
-               swprintf(text, 200,\r
-                               L"Minetest-c55\n"\r
-                               L"by Perttu Ahola\n"\r
-                               L"celeron55@gmail.com\n\n"\r
-                               SWPRINTF_CHARSTRING L"\n"\r
-                               L"userdata path = "\r
-                               SWPRINTF_CHARSTRING\r
-                               ,\r
-                               BUILD_INFO,\r
-                               porting::path_user.c_str()\r
-               );*/\r
-\r
                std::ostringstream os;\r
                os<<"Minetest\n";\r
-               os<<"by Perttu Ahola and contributors\n";\r
-               os<<"celeron55@gmail.com\n";\r
                os<<BUILD_INFO<<"\n";\r
                os<<"path_user = "<<wrap_rows(porting::path_user, 20)<<"\n";\r
        \r