/*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "guiMainMenu.h"
#include "guiKeyChangeMenu.h"
#include "guiCreateWorld.h"
+#include "guiConfigureWorld.h"
#include "guiMessageMenu.h"
#include "guiConfirmMenu.h"
#include "debug.h"
// For IGameCallback
#include "guiPauseMenu.h"
#include "gettext.h"
-#include "utility.h"
#include "tile.h" // getTexturePath
+#include "filesys.h"
+#include "util/string.h"
+#include "subgame.h"
+
+#define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0]))
+#define LSTRING(x) LSTRING_(x)
+#define LSTRING_(x) L##x
+
+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>",
+ L"Maciej Kasatkin (RealBadAngel) <mk@realbadangel.pl>",
+ L"proller <proler@gmail.com>",
+ L"sfan5 <sfan5@live.de>",
+ L"kahrl <kahrl@gmx.net>"
+};
+
+const wchar_t *contrib_active_strs[] = {
+ L"sapier <sapier@gmx.net>",
+ L"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>",
+ L"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
+ L"Jeija <jeija@mesecons.net>",
+ L"MirceaKitsune <mirceakitsune@gmail.com>",
+ L"ShadowNinja",
+ L"dannydark <the_skeleton_of_a_child@yahoo.co.uk>",
+ L"0gb.us <0gb.us@0gb.us>"
+};
+
+const wchar_t *contrib_previous_strs[] = {
+ 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
{
{}
void accepted(std::wstring name, std::string gameid)
{
+ std::string name_narrow = wide_to_narrow(name);
+ if(!string_allowed_blacklist(name_narrow, WORLDNAME_BLACKLISTED_CHARS))
+ {
+ wchar_t* text = wgettext("Cannot create world: Name contains invalid characters");
+ m_menu->displayMessageMenu(text);
+ delete[] text;
+ return;
+ }
+ std::vector<WorldSpec> worlds = getAvailableWorlds();
+ for(std::vector<WorldSpec>::iterator i = worlds.begin();
+ i != worlds.end(); i++)
+ {
+ if((*i).name == name_narrow)
+ {
+ wchar_t* text = wgettext("Cannot create world: A world by this name already exists");
+ m_menu->displayMessageMenu(text);
+ delete[] text;
+ return;
+ }
+ }
m_menu->createNewWorld(name, gameid);
}
GUIMainMenu *m_menu;
struct ConfirmDestDeleteWorld : public ConfirmDest
{
- ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu):
+ ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu,
+ const std::vector<std::string> &paths):
m_spec(spec),
- m_menu(menu)
+ m_menu(menu),
+ m_paths(paths)
{}
void answer(bool answer)
{
if(answer == false)
return;
- m_menu->deleteWorld(m_spec);
+ m_menu->deleteWorld(m_paths);
}
WorldSpec m_spec;
GUIMainMenu *m_menu;
+ std::vector<std::string> m_paths;
};
enum
GUI_ID_SMOOTH_LIGHTING_CB,
GUI_ID_3D_CLOUDS_CB,
GUI_ID_OPAQUE_WATER_CB,
+ GUI_ID_MIPMAP_CB,
+ GUI_ID_ANISOTROPIC_CB,
+ GUI_ID_BILINEAR_CB,
+ GUI_ID_TRILINEAR_CB,
+ GUI_ID_SHADERS_CB,
+ GUI_ID_PRELOAD_ITEM_VISUALS_CB,
+ GUI_ID_ENABLE_PARTICLES_CB,
+ GUI_ID_LIQUID_FINITE_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,
GUI_ID_CONFIGURE_WORLD_BUTTON,
GUI_ID_WORLD_LISTBOX,
GUI_ID_TAB_CONTROL,
-};
-
-enum
-{
- TAB_SINGLEPLAYER=0,
- TAB_MULTIPLAYER,
- TAB_ADVANCED,
- TAB_CREDITS
+ GUI_ID_SERVERLIST,
+ GUI_ID_SERVERLIST_TOGGLE,
+ GUI_ID_SERVERLIST_DELETE,
+ GUI_ID_SERVERLIST_TITLE,
+ GUI_ID_GAME_BUTTON_FIRST = 130,
+ GUI_ID_GAME_BUTTON_MAX = 150,
};
GUIMainMenu::GUIMainMenu(gui::IGUIEnvironment* env,
changeCtype("");
// Version
- if(m_data->selected_tab != TAB_CREDITS)
{
core::rect<s32> rect(0, 0, size.X, 40);
rect += v2s32(4, 0);
- Environment->addStaticText(narrow_to_wide(
- "Minetest-c55 " VERSION_STRING).c_str(),
+ std::string t = "Minetest " VERSION_STRING;
+ if(m_data->selected_game_name != "" &&
+ m_data->selected_tab == TAB_SINGLEPLAYER){
+ t += "/";
+ t += m_data->selected_game_name;
+ }
+ Environment->addStaticText(narrow_to_wide(t).c_str(),
rect, false, true, this, -1);
}
//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 = c800 + v2s32(90, 70+30+50+290);
m_size_server = v2s32(620, 140);
-
+
if(m_data->selected_tab == TAB_ADVANCED)
{
- m_topleft_client = c800 + v2s32(90, 20+50+30);
- m_size_client = v2s32(620, 270);
+ m_topleft_client = c800 + v2s32(90, 70+50+30);
+ m_size_client = v2s32(620, 200);
- m_topleft_server = c800 + v2s32(90, 20+30+50+290);
m_size_server = v2s32(620, 140);
}
+ 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);
gui::IGUITabControl *e = Environment->addTabControl(
rect, this, true, true, GUI_ID_TAB_CONTROL);
- e->addTab(L"Singleplayer");
- e->addTab(L"Multiplayer");
- e->addTab(L"Advanced");
- e->addTab(L"Credits");
+ wchar_t* text = wgettext("Singleplayer");
+ e->addTab(text);
+ delete[] text;
+ text = wgettext("Multiplayer");
+ e->addTab(text);
+ delete[] text;
+ text = wgettext("Advanced");
+ e->addTab(text);
+ delete[] text;
+ text = wgettext("Settings");
+ e->addTab(text);
+ delete[] text;
+ text = wgettext("Credits");
+ e->addTab(text);
+ delete[] text;
+
e->setActiveTab(m_data->selected_tab);
+
}
-#endif
if(m_data->selected_tab == TAB_SINGLEPLAYER)
{
// HYBRID
{
- /*core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_client + v2s32(15, 80);
- const wchar_t *text = L"H\nY\nB\nR\nI\nD";*/
- core::rect<s32> rect(0, 0, 20, 300);
- rect += m_topleft_client + v2s32(15, 15);
- const wchar_t *text = L"T\nA\nP\nE\n\nA\nN\nD\n\nG\nL\nU\nE";
- //gui::IGUIStaticText *t =
+ 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"S\nI\nN\nG\nL\nE\n \nP\nL\nA\nY\nE\nR\n";
+ gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
u32 bs = 5;
// World selection listbox
{
core::rect<s32> rect(0, 0, world_sel_w-4, 20);
rect += m_topleft_client + v2s32(world_sel_x+4, world_sel_y-20);
+ wchar_t* text = wgettext("Select World:");
/*gui::IGUIStaticText *e =*/ Environment->addStaticText(
- wgettext("Select World:"),
+ text,
rect, false, true, this, -1);
+ delete[] text;
/*e->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);*/
}
{
gui::IGUIListBox *e = Environment->addListBox(rect, this,
GUI_ID_WORLD_LISTBOX);
e->setDrawBackground(true);
- for(std::vector<WorldSpec>::const_iterator i = m_data->worlds.begin();
- i != m_data->worlds.end(); i++){
- e->addItem(narrow_to_wide(i->name+" ["+i->gameid+"]").c_str());
+ m_world_indices.clear();
+ for(size_t wi = 0; wi < m_data->worlds.size(); wi++){
+ const WorldSpec &spec = m_data->worlds[wi];
+ if(spec.gameid == m_data->selected_game){
+ //e->addItem(narrow_to_wide(spec.name+" ["+spec.gameid+"]").c_str());
+ e->addItem(narrow_to_wide(spec.name).c_str());
+ m_world_indices.push_back(wi);
+ if(m_data->selected_world == (int)wi)
+ e->setSelected(m_world_indices.size()-1);
+ }
}
- e->setSelected(m_data->selected_world);
Environment->setFocus(e);
}
// Delete world button
{
core::rect<s32> rect(0, 0, world_button_w, 30);
rect += m_topleft_client + v2s32(world_sel_x, world_sel_y+world_sel_h+0);
+ wchar_t* text = wgettext("Delete");
Environment->addButton(rect, this, GUI_ID_DELETE_WORLD_BUTTON,
- wgettext("Delete"));
+ text);
+ delete[] text;
}
// Create world button
{
core::rect<s32> rect(0, 0, world_button_w, 30);
rect += m_topleft_client + v2s32(world_sel_x+world_button_w+bs, world_sel_y+world_sel_h+0);
+ wchar_t* text = wgettext("New");
Environment->addButton(rect, this, GUI_ID_CREATE_WORLD_BUTTON,
- wgettext("New"));
+ text);
+ delete[] text;
}
// Configure world button
{
core::rect<s32> rect(0, 0, world_button_w, 30);
rect += m_topleft_client + v2s32(world_sel_x+(world_button_w+bs)*2,
world_sel_y+world_sel_h+0);
+ wchar_t* text = wgettext("Configure");
Environment->addButton(rect, this, GUI_ID_CONFIGURE_WORLD_BUTTON,
- wgettext("Configure"));
+ text);
+ delete[] text;
}
// Start game button
{
- /*core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-120-30,
- m_size_client.Y-30-20-30-5);*/
/*core::rect<s32> rect(0, 0, world_button_w, 30);
rect += m_topleft_client + v2s32(world_sel_x+(world_button_w+bs)*3,
world_sel_y+world_sel_h+0);*/
u32 bw = 160;
+ /*core::rect<s32> rect(0, 0, bw, 30);
+ rect += m_topleft_client + v2s32(m_size_client.X-bw-30,
+ m_size_client.Y-30-15);*/
core::rect<s32> rect(0, 0, bw, 30);
rect += m_topleft_client + v2s32(world_sel_x+world_sel_w-bw,
world_sel_y+world_sel_h+30+bs);
+ wchar_t* text = wgettext("Play");
Environment->addButton(rect, this,
- GUI_ID_JOIN_GAME_BUTTON, wgettext("Play"));
+ GUI_ID_JOIN_GAME_BUTTON, text);
+ delete[] text;
}
// Options
- //s32 option_x = 450;
s32 option_x = 50;
+ //s32 option_x = 50+world_sel_w+20;
s32 option_y = 30;
+ u32 option_w = 150;
{
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y);
- Environment->addCheckBox(m_data->fancy_trees, rect, this,
- GUI_ID_FANCYTREE_CB, wgettext("Fancy trees"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20);
- Environment->addCheckBox(m_data->smooth_lighting, rect, this,
- GUI_ID_SMOOTH_LIGHTING_CB, wgettext("Smooth Lighting"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*2);
- Environment->addCheckBox(m_data->clouds_3d, rect, this,
- GUI_ID_3D_CLOUDS_CB, wgettext("3D Clouds"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*3);
- Environment->addCheckBox(m_data->opaque_water, rect, this,
- GUI_ID_OPAQUE_WATER_CB, wgettext("Opaque water"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*4);
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*0);
+ wchar_t* text = wgettext("Creative Mode");
Environment->addCheckBox(m_data->creative_mode, rect, this,
- GUI_ID_CREATIVE_CB, wgettext("Creative Mode"));
+ GUI_ID_CREATIVE_CB, text);
+ delete[] text;
}
{
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*5);
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*1);
+ wchar_t* text = wgettext("Enable Damage");
Environment->addCheckBox(m_data->enable_damage, rect, this,
- GUI_ID_DAMAGE_CB, wgettext("Enable Damage"));
- }
- // Key change button
- {
- core::rect<s32> rect(0, 0, 120, 30);
- /*rect += m_topleft_client + v2s32(m_size_client.X-120-30,
- m_size_client.Y-30-20);*/
- rect += m_topleft_client + v2s32(option_x, option_y+20*6+20);
- Environment->addButton(rect, this,
- GUI_ID_CHANGE_KEYS_BUTTON, wgettext("Change keys"));
+ GUI_ID_DAMAGE_CB, text);
+ delete[] text;
}
changeCtype("C");
+
+ /* Add game selection buttons */
+ video::IVideoDriver* driver = Environment->getVideoDriver();
+ for(size_t i=0; i<m_data->games.size(); i++){
+ const SubgameSpec *spec = &m_data->games[i];
+ v2s32 p(8 + i*(48+8), screensize.Y - (48+8));
+ core::rect<s32> rect(0, 0, 48, 48);
+ rect += p;
+ video::ITexture *bgtexture = NULL;
+ if(spec->menuicon_path != "")
+ bgtexture = driver->getTexture(spec->menuicon_path.c_str());
+ gui::IGUIButton *b = Environment->addButton(rect, this,
+ GUI_ID_GAME_BUTTON_FIRST+i, narrow_to_wide(wrap_rows(spec->id, 4)).c_str());
+ if(bgtexture){
+ b->setImage(bgtexture);
+ b->setText(L"");
+ b->setDrawBorder(false);
+ b->setUseAlphaChannel(true);
+ }
+ }
}
else if(m_data->selected_tab == TAB_MULTIPLAYER)
{
changeCtype("");
// CLIENT
{
- core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_client + v2s32(15, 80);
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"C\nL\nI\nE\nN\nT";
- //gui::IGUIStaticText *t =
+ gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Nickname + password
{
core::rect<s32> rect(0, 0, 110, 20);
- rect += m_topleft_client + v2s32(35+30, 50+6);
- Environment->addStaticText(wgettext("Name/Password"),
+ wchar_t* text = wgettext("Name/Password");
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 10+6);
+ Environment->addStaticText(text,
rect, false, true, this, -1);
+ delete [] text;
}
changeCtype("C");
{
- core::rect<s32> rect(0, 0, 230, 30);
- rect += m_topleft_client + v2s32(160+30, 50);
+ core::rect<s32> rect(0, 0, 120, 30);
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
gui::IGUIElement *e =
Environment->addEditBox(m_data->name.c_str(), rect, true, this, GUI_ID_NAME_INPUT);
if(m_data->name == L"")
}
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 90);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, 264);
e->setPasswordBox(true);
}
changeCtype("");
+ // Server List
+ {
+ core::rect<s32> rect(0, 0, 390, 140);
+ rect += m_topleft_client + v2s32(50, 30);
+ gui::IGUIListBox *e = Environment->addListBox(rect, this,
+ GUI_ID_SERVERLIST);
+ e->setDrawBackground(true);
+#if USE_CURL
+ if(m_data->selected_serverlist == SERVERLIST_FAVORITES) {
+ m_data->servers = ServerList::getLocal();
+ {
+ core::rect<s32> rect(0, 0, 390, 20);
+ rect += m_topleft_client + v2s32(50, 10);
+ wchar_t* text = wgettext("Favorites:");
+ Environment->addStaticText(text,
+ rect, false, true, this, GUI_ID_SERVERLIST_TITLE);
+ delete[] text;
+ }
+ } else {
+ m_data->servers = ServerList::getOnline();
+ {
+ core::rect<s32> rect(0, 0, 390, 20);
+ rect += m_topleft_client + v2s32(50, 10);
+ wchar_t* text = wgettext("Public Server List:");
+ Environment->addStaticText(text,
+ rect, false, true, this, GUI_ID_SERVERLIST_TITLE);
+ delete[] text;
+ }
+ }
+#else
+ m_data->servers = ServerList::getLocal();
+ {
+ core::rect<s32> rect(0, 0, 390, 20);
+ rect += m_topleft_client + v2s32(50, 10);
+ wchar_t* text = wgettext("Favorites:");
+ Environment->addStaticText(text,
+ rect, false, true, this, GUI_ID_SERVERLIST_TITLE);
+ delete[] text;
+ }
+#endif
+ updateGuiServerList();
+ e->setSelected(0);
+ }
// Address + port
{
core::rect<s32> rect(0, 0, 110, 20);
- rect += m_topleft_client + v2s32(35+30, 100+6);
- Environment->addStaticText(wgettext("Address/Port"),
+ rect += m_topleft_client + v2s32(50, m_size_client.Y-50-15+6);
+ wchar_t* text = wgettext("Address/Port");
+ Environment->addStaticText(text,
rect, false, true, this, -1);
+ delete [] text;
}
changeCtype("C");
{
- core::rect<s32> rect(0, 0, 230, 30);
- rect += m_topleft_client + v2s32(160+30, 100);
+ core::rect<s32> rect(0, 0, 260, 30);
+ rect += m_topleft_client + v2s32(50, m_size_client.Y-25-15);
gui::IGUIElement *e =
Environment->addEditBox(m_data->address.c_str(), rect, true,
this, GUI_ID_ADDRESS_INPUT);
}
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-60-100, 100);
+ rect += m_topleft_client + v2s32(50+260+10, m_size_client.Y-25-15);
Environment->addEditBox(m_data->port.c_str(), rect, true,
this, GUI_ID_PORT_INPUT);
}
changeCtype("");
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150);
- Environment->addCheckBox(m_data->fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
- wgettext("Fancy trees"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+20);
- Environment->addCheckBox(m_data->smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
- wgettext("Smooth Lighting"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+40);
- Environment->addCheckBox(m_data->clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
- wgettext("3D Clouds"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+60);
- Environment->addCheckBox(m_data->opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
- wgettext("Opaque water"));
+ #if USE_CURL
+ // Toggle Serverlist (Favorites/Online)
+ {
+ core::rect<s32> rect(0, 0, 260, 30);
+ rect += m_topleft_client + v2s32(50,
+ 180);
+ wchar_t* text = wgettext("Show Public");
+ gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_TOGGLE,
+ text);
+ delete[] text;
+ e->setIsPushButton(true);
+ if (m_data->selected_serverlist == SERVERLIST_PUBLIC)
+ {
+ wchar_t* text = wgettext("Show Favorites");
+ e->setText(text);
+ e->setPressed();
+ delete[] text;
+ }
}
- // Key change button
+ #endif
+ // Delete Local Favorite
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-180-30-120-20,
- m_size_client.Y-30-20);
- Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
- wgettext("Change keys"));
+ rect += m_topleft_client + v2s32(50+260+10, 180);
+ wchar_t* text = wgettext("Delete");
+ gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_DELETE,
+ text);
+ if (m_data->selected_serverlist == SERVERLIST_PUBLIC) // Hidden when on public list
+ e->setVisible(false);
+
+ delete [] text;
}
// Start game button
{
- core::rect<s32> rect(0, 0, 180, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-180-30,
- m_size_client.Y-30-20);
+ core::rect<s32> rect(0, 0, 120, 30);
+ rect += m_topleft_client + v2s32(m_size_client.X-130-30,
+ m_size_client.Y-25-15);
+ wchar_t* text = wgettext("Connect");
Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
- wgettext("Start Game / Connect"));
+ text);
+ delete[] text;
}
changeCtype("C");
}
changeCtype("");
// CLIENT
{
- core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_client + v2s32(15, 80);
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"C\nL\nI\nE\nN\nT";
- //gui::IGUIStaticText *t =
+ gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Nickname + password
{
core::rect<s32> rect(0, 0, 110, 20);
- rect += m_topleft_client + v2s32(35+30, 50+6);
- Environment->addStaticText(wgettext("Name/Password"),
+ rect += m_topleft_client + v2s32(35+30, 35+6);
+ wchar_t* text = wgettext("Name/Password");
+ Environment->addStaticText(text,
rect, false, true, this, -1);
+ delete [] text;
}
changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
- rect += m_topleft_client + v2s32(160+30, 50);
+ rect += m_topleft_client + v2s32(160+30, 35);
gui::IGUIElement *e =
Environment->addEditBox(m_data->name.c_str(), rect, true, this, GUI_ID_NAME_INPUT);
if(m_data->name == L"")
}
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 35);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, 264);
e->setPasswordBox(true);
// Address + port
{
core::rect<s32> rect(0, 0, 110, 20);
- rect += m_topleft_client + v2s32(35+30, 100+6);
- Environment->addStaticText(wgettext("Address/Port"),
+ rect += m_topleft_client + v2s32(35+30, 75+6);
+ wchar_t* text = wgettext("Address/Port");
+ Environment->addStaticText(text,
rect, false, true, this, -1);
+ delete[] text;
}
changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
- rect += m_topleft_client + v2s32(160+30, 100);
+ rect += m_topleft_client + v2s32(160+30, 75);
gui::IGUIElement *e =
Environment->addEditBox(m_data->address.c_str(), rect, true,
this, GUI_ID_ADDRESS_INPUT);
}
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-60-100, 100);
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 75);
Environment->addEditBox(m_data->port.c_str(), rect, true,
this, GUI_ID_PORT_INPUT);
}
changeCtype("");
{
core::rect<s32> rect(0, 0, 400, 20);
- rect += m_topleft_client + v2s32(160+30, 100+35);
- Environment->addStaticText(wgettext("Leave address blank to start a local server."),
+ rect += m_topleft_client + v2s32(160+30, 75+35);
+ wchar_t* text = wgettext("Leave address blank to start a local server.");
+ Environment->addStaticText(text,
rect, false, true, this, -1);
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150);
- Environment->addCheckBox(m_data->fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
- wgettext("Fancy trees"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+20);
- Environment->addCheckBox(m_data->smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
- wgettext("Smooth Lighting"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+40);
- Environment->addCheckBox(m_data->clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
- wgettext("3D Clouds"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+60);
- Environment->addCheckBox(m_data->opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
- wgettext("Opaque water"));
- }
- // Key change button
- {
- core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-180-30-120-20,
- m_size_client.Y-30-20);
- Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
- wgettext("Change keys"));
+ delete[] text;
}
// Start game button
{
core::rect<s32> rect(0, 0, 180, 30);
rect += m_topleft_client + v2s32(m_size_client.X-180-30,
m_size_client.Y-30-20);
+ wchar_t* text = wgettext("Start Game / Connect");
Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
- wgettext("Start Game / Connect"));
+ text);
+ delete[] text;
}
/*
Server section
*/
// SERVER
{
- core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_server + v2s32(15, 15);
+ core::rect<s32> rect(0, 0, 10, m_size_server.Y);
+ rect += m_topleft_server + v2s32(15, 0);
const wchar_t *text = L"S\nE\nR\nV\nE\nR";
- //gui::IGUIStaticText *t =
+ gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Server parameters
{
core::rect<s32> rect(0, 0, 250, 30);
rect += m_topleft_server + v2s32(30+20+250+20, 20);
+ wchar_t* text = wgettext("Creative Mode");
Environment->addCheckBox(m_data->creative_mode, rect, this, GUI_ID_CREATIVE_CB,
- wgettext("Creative Mode"));
+ text);
+ delete[] text;
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += m_topleft_server + v2s32(30+20+250+20, 40);
+ wchar_t* text = wgettext("Enable Damage");
Environment->addCheckBox(m_data->enable_damage, rect, this, GUI_ID_DAMAGE_CB,
- wgettext("Enable Damage"));
+ text);
+ delete[] text;
+ }
+ #if USE_CURL
+ {
+ core::rect<s32> rect(0, 0, 250, 30);
+ rect += m_topleft_server + v2s32(30+20+250+20, 60);
+ wchar_t* text = wgettext("Public");
+ Environment->addCheckBox(m_data->enable_public, rect, this, GUI_ID_PUBLIC_CB,
+ text);
+ delete[] text;
}
+ #endif
// Delete world button
{
core::rect<s32> rect(0, 0, 130, 30);
rect += m_topleft_server + v2s32(30+20+250+20, 90);
+ wchar_t* text = wgettext("Delete world");
Environment->addButton(rect, this, GUI_ID_DELETE_WORLD_BUTTON,
- wgettext("Delete world"));
+ text );
+ delete[] text;
}
// Create world button
{
core::rect<s32> rect(0, 0, 130, 30);
rect += m_topleft_server + v2s32(30+20+250+20+140, 90);
+ wchar_t* text = wgettext("Create world");
Environment->addButton(rect, this, GUI_ID_CREATE_WORLD_BUTTON,
- wgettext("Create world"));
+ text );
+ delete[] text;
}
// World selection listbox
{
gui::IGUIListBox *e = Environment->addListBox(rect, this,
GUI_ID_WORLD_LISTBOX);
e->setDrawBackground(true);
- for(std::vector<WorldSpec>::const_iterator i = m_data->worlds.begin();
- i != m_data->worlds.end(); i++){
- e->addItem(narrow_to_wide(i->name+" ["+i->gameid+"]").c_str());
+ m_world_indices.clear();
+ for(size_t wi = 0; wi < m_data->worlds.size(); wi++){
+ const WorldSpec &spec = m_data->worlds[wi];
+ e->addItem(narrow_to_wide(spec.name+" ["+spec.gameid+"]").c_str());
+ m_world_indices.push_back(wi);
}
e->setSelected(m_data->selected_world);
}
changeCtype("C");
}
+ else if(m_data->selected_tab == TAB_SETTINGS)
+ {
+ {
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ 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, true, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
+ }
+ s32 option_x = 70;
+ s32 option_y = 50;
+ u32 option_w = 150;
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y);
+ wchar_t* text = wgettext("Fancy trees");
+ Environment->addCheckBox(m_data->fancy_trees, rect, this,
+ GUI_ID_FANCYTREE_CB, text);
+ delete[] text;
+ }
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20);
+ wchar_t* text = wgettext("Smooth Lighting");
+ Environment->addCheckBox(m_data->smooth_lighting, rect, this,
+ GUI_ID_SMOOTH_LIGHTING_CB, text);
+ delete[] text;
+ }
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*2);
+ wchar_t* text = wgettext("3D Clouds");
+ Environment->addCheckBox(m_data->clouds_3d, rect, this,
+ GUI_ID_3D_CLOUDS_CB, text);
+ delete[] text;
+ }
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*3);
+ wchar_t* text = wgettext("Opaque water");
+ Environment->addCheckBox(m_data->opaque_water, rect, this,
+ GUI_ID_OPAQUE_WATER_CB, text);
+ delete[] text;
+ }
+
+
+ // Anisotropic/mipmap/bi-/trilinear settings
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175, option_y);
+ wchar_t* text = wgettext("Mip-Mapping");
+ Environment->addCheckBox(m_data->mip_map, rect, this,
+ GUI_ID_MIPMAP_CB, text);
+ delete[] text;
+ }
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175, option_y+20);
+ wchar_t* text = wgettext("Anisotropic Filtering");
+ Environment->addCheckBox(m_data->anisotropic_filter, rect, this,
+ GUI_ID_ANISOTROPIC_CB, text);
+ delete[] text;
+ }
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175, option_y+20*2);
+ wchar_t* text = wgettext("Bi-Linear Filtering");
+ Environment->addCheckBox(m_data->bilinear_filter, rect, this,
+ GUI_ID_BILINEAR_CB, text);
+ delete[] text;
+ }
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175, option_y+20*3);
+ wchar_t* text = wgettext("Tri-Linear Filtering");
+ Environment->addCheckBox(m_data->trilinear_filter, rect, this,
+ GUI_ID_TRILINEAR_CB, text);
+ delete[] text;
+ }
+
+ // shader/on demand image loading/particles settings
+ {
+ core::rect<s32> rect(0, 0, option_w+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175*2, option_y);
+ wchar_t* text = wgettext("Shaders");
+ Environment->addCheckBox(m_data->enable_shaders, rect, this,
+ GUI_ID_SHADERS_CB, text);
+ delete[] text;
+ }
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175*2, option_y+20);
+ wchar_t* text = wgettext("Preload item visuals");
+ Environment->addCheckBox(m_data->preload_item_visuals, rect, this,
+ GUI_ID_PRELOAD_ITEM_VISUALS_CB, text);
+ delete[] text;
+ }
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175*2, option_y+20*2);
+ wchar_t* text = wgettext("Enable Particles");
+ Environment->addCheckBox(m_data->enable_particles, rect, this,
+ GUI_ID_ENABLE_PARTICLES_CB, text);
+ delete[] text;
+ }
+
+ {
+ core::rect<s32> rect(0, 0, option_w+20+20, 30);
+ rect += m_topleft_client + v2s32(option_x+175*2, option_y+20*3);
+ wchar_t* text = wgettext("Finite liquid");
+ Environment->addCheckBox(m_data->liquid_finite, rect, this,
+ GUI_ID_LIQUID_FINITE_CB, text);
+ delete[] text;
+ }
+
+ // Key change button
+ {
+ core::rect<s32> rect(0, 0, 120, 30);
+ /*rect += m_topleft_client + v2s32(m_size_client.X-120-30,
+ m_size_client.Y-30-20);*/
+ rect += m_topleft_client + v2s32(option_x, option_y+120);
+ wchar_t* text = wgettext("Change keys");
+ Environment->addButton(rect, this,
+ GUI_ID_CHANGE_KEYS_BUTTON, text);
+ delete[] text;
+ }
+ changeCtype("C");
+ }
else if(m_data->selected_tab == TAB_CREDITS)
{
// CREDITS
{
- core::rect<s32> rect(0, 0, 20, 200);
- rect += m_topleft_client + v2s32(15, 60);
+ 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 =
+ gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
- }
- {
- core::rect<s32> rect(0, 0, 620, 250);
- rect += m_topleft_client + v2s32(150+14, 50+35);
- Environment->addStaticText(narrow_to_wide(
- "Minetest-c55 " VERSION_STRING "\n"
- "http://c55.me/minetest/\n"
- "\n"
- "by Perttu Ahola <celeron55@gmail.com>\n"
- "and contributors"
- ).c_str(), rect, false, true, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
+ }
+ {
+ core::rect<s32> rect(0, 0, 130, 70);
+ rect += m_topleft_client + v2s32(35, 160);
+ Environment->addStaticText(
+ L"Minetest " LSTRING(VERSION_STRING) L"\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"");
}
}
if (!skin)
return;
video::IVideoDriver* driver = Environment->getVideoDriver();
-
+
+ /* Draw menu background */
+
/*video::SColor bgcolor(140,0,0,0);
driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);*/
driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
}
}
+ else if(getTab() == TAB_SETTINGS)
+ {
+ {
+ core::rect<s32> rect(0, 0, m_size_client.X, m_size_client.Y);
+ rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
+ driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
+ }
+ }
else if(getTab() == TAB_CREDITS)
{
{
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(150, 50);
+ rect += v2s32(50, 60);
driver->draw2DImage(logotexture, rect,
core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(logotexture->getSize())),
}
}
+ /* Draw UI elements */
+
gui::IGUIElement::draw();
}
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)
dst->opaque_water = ((gui::IGUICheckBox*)e)->isChecked();
}
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_MIPMAP_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->mip_map = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_ANISOTROPIC_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->anisotropic_filter = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_BILINEAR_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->bilinear_filter = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_TRILINEAR_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->trilinear_filter = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_SHADERS_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->enable_shaders = ((gui::IGUICheckBox*)e)->isChecked() ? 2 : 0;
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_PRELOAD_ITEM_VISUALS_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->preload_item_visuals = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_ENABLE_PARTICLES_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->enable_particles = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_LIQUID_FINITE_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ dst->liquid_finite = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+
{
gui::IGUIElement *e = getElementFromId(GUI_ID_WORLD_LISTBOX);
- if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX)
- dst->selected_world = ((gui::IGUIListBox*)e)->getSelected();
+ if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX){
+ int list_i = ((gui::IGUIListBox*)e)->getSelected();
+ if(list_i == -1)
+ dst->selected_world = -1;
+ else
+ dst->selected_world = m_world_indices[list_i];
+ }
+ }
+ {
+ ServerListSpec server =
+ getServerListSpec(wide_to_narrow(dst->address), wide_to_narrow(dst->port));
+ dst->servername = server["name"].asString();
+ dst->serverdescription = server["description"].asString();
}
}
regenerateGui(m_screensize_old);
return true;
}
+ if(event.GUIEvent.EventType==gui::EGET_LISTBOX_CHANGED && event.GUIEvent.Caller->getID() == GUI_ID_SERVERLIST)
+ {
+ serverListOnSelected();
+ return true;
+ }
if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED)
{
switch(event.GUIEvent.Caller->getID())
case GUI_ID_JOIN_GAME_BUTTON: {
MainMenuData cur;
readInput(&cur);
- if(cur.address == L"" && getTab() == TAB_MULTIPLAYER){
+ if (getTab() == TAB_MULTIPLAYER && cur.address == L"")
+ {
+ wchar_t* text = wgettext("Address required.");
(new GUIMessageMenu(env, parent, -1, menumgr,
- wgettext("Address required."))
+ text)
)->drop();
+ delete[] text;
return true;
}
acceptInput();
MainMenuData cur;
readInput(&cur);
if(cur.selected_world == -1){
+ wchar_t* text = wgettext("Cannot delete world: Nothing selected");
(new GUIMessageMenu(env, parent, -1, menumgr,
- wgettext("Cannot delete world: Nothing selected"))
+ text)
)->drop();
+ delete[] text;
} else {
WorldSpec spec = m_data->worlds[cur.selected_world];
+ // Get files and directories involved
+ std::vector<std::string> paths;
+ paths.push_back(spec.path);
+ fs::GetRecursiveSubPaths(spec.path, paths);
+ // Launch confirmation dialog
ConfirmDestDeleteWorld *dest = new
- ConfirmDestDeleteWorld(spec, this);
+ ConfirmDestDeleteWorld(spec, this, paths);
+ wchar_t* text1 = wgettext("Delete world");
+ wchar_t* text2 = wgettext("Files to be deleted");
+ std::wstring text = text1;
+ text += L" \"";
+ text += narrow_to_wide(spec.name);
+ text += L"\"?\n\n";
+ text += text2;
+ text += L":\n";
+ delete[] text1;
+ delete[] text2;
+ for(u32 i=0; i<paths.size(); i++){
+ if(i == 3){ text += L"..."; break; }
+ text += narrow_to_wide(paths[i]) + L"\n";
+ }
(new GUIConfirmMenu(env, parent, -1, menumgr, dest,
- (std::wstring(wgettext("Delete world "))
- +L"\""+narrow_to_wide(spec.name)+L"\"?").c_str()
- ))->drop();
+ text.c_str()))->drop();
}
return true;
}
case GUI_ID_CREATE_WORLD_BUTTON: {
- std::vector<SubgameSpec> games = getAvailableGames();
+ const std::vector<SubgameSpec> &games = m_data->games;
if(games.size() == 0){
+ wchar_t* text = wgettext("Cannot create world: No games found");
GUIMessageMenu *menu = new GUIMessageMenu(env, parent,
-1, menumgr,
- wgettext("Cannot create world: No games found"));
+ text);
menu->drop();
+ delete[] text;
} else {
CreateWorldDest *dest = new CreateWorldDestMainMenu(this);
GUICreateWorld *menu = new GUICreateWorld(env, parent, -1,
- menumgr, dest, games);
+ menumgr, dest, games, m_data->selected_game);
menu->drop();
}
return true;
}
case GUI_ID_CONFIGURE_WORLD_BUTTON: {
- GUIMessageMenu *menu = new GUIMessageMenu(env, parent,
- -1, menumgr,
- wgettext("Nothing here"));
- menu->drop();
+ MainMenuData cur;
+ readInput(&cur);
+ if(cur.selected_world == -1)
+ {
+ wchar_t* text = wgettext("Cannot configure world: Nothing selected");
+ (new GUIMessageMenu(env, parent, -1, menumgr,
+ text)
+ )->drop();
+ delete[] text;
+ }
+ else
+ {
+ WorldSpec wspec = m_data->worlds[cur.selected_world];
+ GUIConfigureWorld *menu = new GUIConfigureWorld(env, parent,
+ -1, menumgr, wspec);
+ menu->drop();
+ }
+ return true;
+ }
+ case GUI_ID_SERVERLIST_DELETE: {
+ gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+ s32 selected = ((gui::IGUIListBox*)serverlist)->getSelected();
+ if (selected == -1) return true;
+ ServerList::deleteEntry(m_data->servers[selected]);
+ m_data->servers = ServerList::getLocal();
+ updateGuiServerList();
+ if (selected > 0)
+ selected -= 1;
+ serverlist->setSelected(selected);
+ serverListOnSelected();
return true;
}
+ #if USE_CURL
+ case GUI_ID_SERVERLIST_TOGGLE: {
+ gui::IGUIElement *togglebutton = getElementFromId(GUI_ID_SERVERLIST_TOGGLE);
+ gui::IGUIElement *deletebutton = getElementFromId(GUI_ID_SERVERLIST_DELETE);
+ gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+ gui::IGUIElement *title = getElementFromId(GUI_ID_SERVERLIST_TITLE);
+ if (m_data->selected_serverlist == SERVERLIST_PUBLIC) // switch to favorite list
+ {
+ m_data->servers = ServerList::getLocal();
+ wchar_t* text1 = wgettext("Show Public");
+ wchar_t* text2 = wgettext("Favorites:");
+ togglebutton->setText(text1);
+ title->setText(text2);
+ delete[] text1;
+ delete[] text2;
+ deletebutton->setVisible(true);
+ updateGuiServerList();
+ serverlist->setSelected(0);
+ m_data->selected_serverlist = SERVERLIST_FAVORITES;
+ }
+ else // switch to online list
+ {
+ m_data->servers = ServerList::getOnline();
+ wchar_t* text1 = wgettext("Show Favorites");
+ wchar_t* text2 = wgettext("Public Server List:");
+ togglebutton->setText(text1);
+ title->setText(text2);
+ delete[] text1;
+ delete[] text2;
+ deletebutton->setVisible(false);
+ updateGuiServerList();
+ serverlist->setSelected(0);
+ m_data->selected_serverlist = SERVERLIST_PUBLIC;
+ }
+ serverListOnSelected();
+ }
+ #endif
+ }
+ /* Game buttons */
+ int eid = event.GUIEvent.Caller->getID();
+ if(eid >= GUI_ID_GAME_BUTTON_FIRST &&
+ eid <= GUI_ID_GAME_BUTTON_MAX){
+ m_data->selected_game =
+ m_data->games[eid - GUI_ID_GAME_BUTTON_FIRST].id;
+ m_data->selected_game_name =
+ m_data->games[eid - GUI_ID_GAME_BUTTON_FIRST].name;
+ regenerateGui(m_screensize_old);
}
}
if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
switch(event.GUIEvent.Caller->getID())
{
case GUI_ID_ADDRESS_INPUT: case GUI_ID_PORT_INPUT: case GUI_ID_NAME_INPUT: case 264:
+ MainMenuData cur;
+ readInput(&cur);
+ if (getTab() == TAB_MULTIPLAYER && cur.address == L"")
+ {
+ wchar_t* text = wgettext("Address required.");
+ (new GUIMessageMenu(env, parent, -1, menumgr,
+ text)
+ )->drop();
+ delete[] text;
+ return true;
+ }
acceptInput();
quitMenu();
return true;
}
}
+ if(event.GUIEvent.EventType==gui::EGET_LISTBOX_CHANGED)
+ {
+ readInput(m_data);
+ }
if(event.GUIEvent.EventType==gui::EGET_LISTBOX_SELECTED_AGAIN)
{
switch(event.GUIEvent.Caller->getID())
{
- case GUI_ID_WORLD_LISTBOX:
+ case GUI_ID_WORLD_LISTBOX:
acceptInput();
- m_data->address = L""; // Force local game
+ if(getTab() != TAB_SINGLEPLAYER)
+ m_data->address = L""; // Force local game
quitMenu();
return true;
+ case GUI_ID_SERVERLIST:
+ gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+ if (serverlist->getSelected() > -1)
+ {
+ acceptInput();
+ quitMenu();
+ return true;
+ }
}
}
}
quitMenu();
}
-void GUIMainMenu::deleteWorld(WorldSpec spec)
+void GUIMainMenu::deleteWorld(const std::vector<std::string> &paths)
{
- if(!spec.isValid())
- return;
+ // Delete files
+ bool did = fs::DeletePaths(paths);
+ if(!did){
+ wchar_t* text = wgettext("Failed to delete all world files");
+ GUIMessageMenu *menu = new GUIMessageMenu(env, parent,
+ -1, menumgr, text);
+ delete[] text;
+ menu->drop();
+ }
+ // Quit menu to refresh it
acceptInput();
- m_data->delete_world_spec = spec;
+ m_data->only_refresh = true;
quitMenu();
}
return TAB_SINGLEPLAYER; // Default
}
+void GUIMainMenu::displayMessageMenu(std::wstring msg)
+{
+ (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
+}
+
+void GUIMainMenu::updateGuiServerList()
+{
+ gui::IGUIListBox *serverlist = (gui::IGUIListBox *)getElementFromId(GUI_ID_SERVERLIST);
+ serverlist->clear();
+
+ for(std::vector<ServerListSpec>::iterator i = m_data->servers.begin();
+ i != m_data->servers.end(); i++)
+ {
+ std::string text;
+
+ 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());
+ }
+}
+
+void GUIMainMenu::serverListOnSelected()
+{
+ if (!m_data->servers.empty())
+ {
+ gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
+ u16 id = serverlist->getSelected();
+ //if (id < 0) return; // u16>0!
+ ((gui::IGUIEditBox*)getElementFromId(GUI_ID_ADDRESS_INPUT))
+ ->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"].asString()).c_str());
+ }
+}
+
+ServerListSpec GUIMainMenu::getServerListSpec(std::string address, std::string port)
+{
+ ServerListSpec server;
+ 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)
+ {
+ server["description"] = (*i)["description"];
+ server["name"] = (*i)["name"];
+ break;
+ }
+ }
+ return server;
+}