/*
-Minetest-c55
-Copyright (C) 2010-12 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-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
#include "util/string.h"
#include "subgame.h"
+#define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0]))
+
+const wchar_t *contrib_core_strs[] = {
+ L"Perttu Ahola (celeron55) <celeron55@gmail.com>",
+ L"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>",
+ L"PilzAdam <pilzadam@minetest.net>",
+ L"Ilya Zhuravlev (thexyz) <xyz@minetest.net>",
+ L"Lisa Milne (darkrose) <lisa@ltmnet.com>"
+};
+
+const wchar_t *contrib_active_strs[] = {
+ L"RealBadAngel <mk@realbadangel.pl>",
+ L"sfan5 <sfan5@live.de>",
+ L"sapier <sapier@gmx.net>",
+ L"proller <proler@gmail.com>",
+ L"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>",
+ L"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
+ L"ShadowNinja",
+ L"dannydark <the_skeleton_of_a_child@yahoo.co.uk>",
+ L"Jeija <jeija@mesecons.net>",
+ L"MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>"
+};
+
+const wchar_t *contrib_previous_strs[] = {
+ L"kahrl <kahrl@gmx.net>",
+ L"Giuseppe Bilotta (Oblomov) <giuseppe.bilotta@gmail.com>",
+ L"Jonathan Neuschafer <j.neuschaefer@gmx.net>",
+ L"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>",
+ L"Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>",
+ L"matttpt <matttpt@gmail.com>",
+ L"JacobF <queatz@gmail.com>"
+};
+
+
struct CreateWorldDestMainMenu : public CreateWorldDest
{
CreateWorldDestMainMenu(GUIMainMenu *menu):
GUI_ID_ENABLE_PARTICLES_CB,
GUI_ID_DAMAGE_CB,
GUI_ID_CREATIVE_CB,
+ GUI_ID_PUBLIC_CB,
GUI_ID_JOIN_GAME_BUTTON,
GUI_ID_CHANGE_KEYS_BUTTON,
GUI_ID_DELETE_WORLD_BUTTON,
changeCtype("");
// Version
- //if(m_data->selected_tab != TAB_CREDITS)
{
core::rect<s32> rect(0, 0, size.X, 40);
rect += v2s32(4, 0);
}
//v2s32 center(size.X/2, size.Y/2);
- v2s32 c800(size.X/2-400, size.Y/2-300);
+ v2s32 c800(size.X/2-400, size.Y/2-270);
m_topleft_client = c800 + v2s32(90, 70+50+30);
m_size_client = v2s32(620, 270);
m_topleft_server = m_topleft_client + v2s32(0, m_size_client.Y+20);
// Tabs
-#if 1
{
core::rect<s32> rect(0, 0, m_size_client.X, 30);
rect += m_topleft_client + v2s32(0, -30);
e->addTab(wgettext("Credits"));
e->setActiveTab(m_data->selected_tab);
}
-#endif
if(m_data->selected_tab == TAB_SINGLEPLAYER)
{
core::rect<s32> rect(0, 0, 10, m_size_client.Y);
rect += m_topleft_client + v2s32(15, 0);
//const wchar_t *text = L"H\nY\nB\nR\nI\nD";
- const wchar_t *text = L"T\nA\nP\nE\n\nA\nN\nD\n\nG\nL\nU\nE";
+ const wchar_t *text = L"S\nI\nN\nG\nL\nE\n \nP\nL\nA\nY\nE\nR\n";
gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, false, this, -1);
+ Environment->addStaticText(text, rect, false, true, this, -1);
t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
u32 bs = 5;
rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"C\nL\nI\nE\nN\nT";
gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, false, this, -1);
+ Environment->addStaticText(text, rect, false, true, this, -1);
t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Nickname + password
rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"C\nL\nI\nE\nN\nT";
gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, false, this, -1);
+ Environment->addStaticText(text, rect, false, true, this, -1);
t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Nickname + password
rect += m_topleft_server + v2s32(15, 0);
const wchar_t *text = L"S\nE\nR\nV\nE\nR";
gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, false, this, -1);
+ Environment->addStaticText(text, rect, false, true, this, -1);
t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Server parameters
Environment->addCheckBox(m_data->enable_damage, rect, this, GUI_ID_DAMAGE_CB,
wgettext("Enable Damage"));
}
+ #if USE_CURL
+ {
+ core::rect<s32> rect(0, 0, 250, 30);
+ rect += m_topleft_server + v2s32(30+20+250+20, 60);
+ Environment->addCheckBox(m_data->enable_public, rect, this, GUI_ID_PUBLIC_CB,
+ wgettext("Public"));
+ }
+ #endif
// Delete world button
{
core::rect<s32> rect(0, 0, 130, 30);
rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"S\nE\nT\nT\nI\nN\nG\nS";
gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, false, this, -1);
+ Environment->addStaticText(text, rect, false, true, this, -1);
t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
s32 option_x = 70;
{
// CREDITS
{
- core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ core::rect<s32> rect(0, 0, 9, m_size_client.Y);
rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"C\nR\nE\nD\nI\nT\nS";
gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, false, this, -1);
+ Environment->addStaticText(text, rect, false, true, this, -1);
t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
{
- core::rect<s32> rect(0, 0, 454, 250);
- rect += m_topleft_client + v2s32(110, 50+35);
- Environment->addStaticText(narrow_to_wide(
- "Minetest " VERSION_STRING "\n"
- "http://minetest.net/\n"
- "\n"
- "by Perttu Ahola <celeron55@gmail.com>\n"
- "and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschäfer, thexyz, VanessaE, sfan5... and tens of more random people."
- ).c_str(), rect, false, true, this, -1);
+ core::rect<s32> rect(0, 0, 130, 70);
+ rect += m_topleft_client + v2s32(35, 160);
+ Environment->addStaticText(
+ L"Minetest " VERSION_STRING "\nhttp://minetest.net/",
+ rect, false, true, this, -1);
+ }
+ {
+ video::SColor yellow(255, 255, 255, 0);
+ core::rect<s32> rect(0, 0, 450, 260);
+ rect += m_topleft_client + v2s32(168, 5);
+
+ irr::gui::IGUIListBox *list = Environment->addListBox(rect, this);
+
+ list->addItem(L"Core Developers");
+ list->setItemOverrideColor(list->getItemCount() - 1, yellow);
+ for (int i = 0; i != ARRAYLEN(contrib_core_strs); i++)
+ list->addItem(contrib_core_strs[i]);
+ list->addItem(L"");
+ list->addItem(L"Active Contributors");
+ list->setItemOverrideColor(list->getItemCount() - 1, yellow);
+ for (int i = 0; i != ARRAYLEN(contrib_active_strs); i++)
+ list->addItem(contrib_active_strs[i]);
+ list->addItem(L"");
+ list->addItem(L"Previous Contributors");
+ list->setItemOverrideColor(list->getItemCount() - 1, yellow);
+ for (int i = 0; i != ARRAYLEN(contrib_previous_strs); i++)
+ list->addItem(contrib_previous_strs[i]);
+ list->addItem(L"");
}
}
driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
}
video::ITexture *logotexture =
- driver->getTexture(getTexturePath("menulogo.png").c_str());
+ driver->getTexture(getTexturePath("logo.png").c_str());
if(logotexture)
{
v2s32 logosize(logotexture->getOriginalSize().Width,
logotexture->getOriginalSize().Height);
- logosize *= 2;
+
core::rect<s32> rect(0,0,logosize.X,logosize.Y);
rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
- rect += v2s32(130, 50);
+ rect += v2s32(50, 60);
driver->draw2DImage(logotexture, rect,
core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(logotexture->getSize())),
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
dst->enable_damage = ((gui::IGUICheckBox*)e)->isChecked();
}
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_PUBLIC_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->enable_public = ((gui::IGUICheckBox*)e)->isChecked();
+ }
{
gui::IGUIElement *e = getElementFromId(GUI_ID_FANCYTREE_CB);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
{
ServerListSpec server =
getServerListSpec(wide_to_narrow(dst->address), wide_to_narrow(dst->port));
- dst->servername = server.name;
- dst->serverdescription = server.description;
+ dst->servername = server["name"].asString();
+ dst->serverdescription = server["description"].asString();
}
}
i != m_data->servers.end(); i++)
{
std::string text;
- if (i->name != "" && i->description != "")
- text = i->name + " (" + i->description + ")";
- else if (i->name !="")
- text = i->name;
- else
- text = i->address + ":" + i->port;
+ if ((*i)["clients"].asString().size())
+ text += (*i)["clients"].asString();
+ if ((*i)["clients_max"].asString().size())
+ text += "/" + (*i)["clients_max"].asString();
+ text += " ";
+ if ((*i)["version"].asString().size())
+ text += (*i)["version"].asString() + " ";
+ if ((*i)["password"].asString().size())
+ text += "*";
+ if ((*i)["creative"].asString().size())
+ text += "C";
+ if ((*i)["damage"].asString().size())
+ text += "D";
+ if ((*i)["pvp"].asString().size())
+ text += "P";
+ text += " ";
+
+ if ((*i)["name"] != "" && (*i)["description"] != "")
+ text += (*i)["name"].asString() + " (" + (*i)["description"].asString() + ")";
+ else if ((*i)["name"] !="")
+ text += (*i)["name"].asString();
+ else
+ text += (*i)["address"].asString() + ":" + (*i)["port"].asString();
+
serverlist->addItem(narrow_to_wide(text).c_str());
}
}
{
gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
u16 id = serverlist->getSelected();
- if (id < 0) return;
+ //if (id < 0) return; // u16>0!
((gui::IGUIEditBox*)getElementFromId(GUI_ID_ADDRESS_INPUT))
- ->setText(narrow_to_wide(m_data->servers[id].address).c_str());
+ ->setText(narrow_to_wide(m_data->servers[id]["address"].asString()).c_str());
((gui::IGUIEditBox*)getElementFromId(GUI_ID_PORT_INPUT))
- ->setText(narrow_to_wide(m_data->servers[id].port).c_str());
+ ->setText(narrow_to_wide(m_data->servers[id]["port"].asString()).c_str());
}
}
ServerListSpec GUIMainMenu::getServerListSpec(std::string address, std::string port)
{
ServerListSpec server;
- server.address = address;
- server.port = port;
+ server["address"] = address;
+ server["port"] = port;
for(std::vector<ServerListSpec>::iterator i = m_data->servers.begin();
i != m_data->servers.end(); i++)
{
- if (i->address == address && i->port == port)
+ if ((*i)["address"] == address && (*i)["port"] == port)
{
- server.description = i->description;
- server.name = i->name;
+ server["description"] = (*i)["description"];
+ server["name"] = (*i)["name"];
break;
}
}
projects / minetest.git / blobdiff