/*
-Minetest-c55
-Copyright (C) 2010-2011 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.
*/
-/*
-=============================== NOTES ==============================
-NOTE: Things starting with TODO are sometimes only suggestions.
-
-NOTE: iostream.imbue(std::locale("C")) is very slow
-NOTE: Global locale is now set at initialization
-
-NOTE: If VBO (EHM_STATIC) is used, remember to explicitly free the
- hardware buffer (it is not freed automatically)
-
-NOTE: A random to-do list saved here as documentation:
-A list of "active blocks" in which stuff happens. (+=done)
- + Add a never-resetted game timer to the server
- + Add a timestamp value to blocks
- + The simple rule: All blocks near some player are "active"
- - Do stuff in real time in active blocks
- + Handle objects
- - Grow grass, delete leaves without a tree
- - Spawn some mobs based on some rules
- - Transform cobble to mossy cobble near water
- - Run a custom script
- - ...And all kinds of other dynamic stuff
- + Keep track of when a block becomes active and becomes inactive
- + When a block goes inactive:
- + Store objects statically to block
- + Store timer value as the timestamp
- + When a block goes active:
- + Create active objects out of static objects
- - Simulate the results of what would have happened if it would have
- been active for all the time
- - Grow a lot of grass and so on
- + Initially it is fine to send information about every active object
- to every player. Eventually it should be modified to only send info
- about the nearest ones.
- + This was left to be done by the old system and it sends only the
- nearest ones.
-
-Vim conversion regexpes for moving to extended content type storage:
-%s/\(\.\|->\)d \([!=]=\)/\1getContent() \2/g
-%s/content_features(\([^.]*\)\.d)/content_features(\1)/g
-%s/\(\.\|->\)d = \([^;]*\);/\1setContent(\2);/g
-%s/\(getNodeNoExNoEmerge([^)]*)\)\.d/\1.getContent()/g
-%s/\(getNodeNoExNoEmerge(.*)\)\.d/\1.getContent()/g
-%s/\.d;/.getContent();/g
-%s/\(content_liquid\|content_flowing_liquid\|make_liquid_flowing\|content_pointable\)(\([^.]*\).d)/\1(\2.getContent())/g
-Other things to note:
-- node.d = node.param0 (only in raw serialization; use getContent() otherwise)
-- node.param = node.param1
-- node.dir = node.param2
-- content_walkable(node.d) etc should be changed to
- content_features(node).walkable etc
-- Also check for lines that store the result of getContent to a 8-bit
- variable and fix them (result of getContent() must be stored in
- content_t, which is 16-bit)
-
-NOTE: Seeds in 1260:6c77e7dbfd29:
-5721858502589302589:
- Spawns you on a small sand island with a surface dungeon
-2983455799928051958:
- Enormous jungle + a surface dungeon at ~(250,0,0)
-
-Old, wild and random suggestions that probably won't be done:
--------------------------------------------------------------
-
-SUGG: If player is on ground, mainly fetch ground-level blocks
-
-SUGG: Expose Connection's seqnums and ACKs to server and client.
- - This enables saving many packets and making a faster connection
- - This also enables server to check if client has received the
- most recent block sent, for example.
-SUGG: Add a sane bandwidth throttling system to Connection
-
-SUGG: More fine-grained control of client's dumping of blocks from
- memory
- - ...What does this mean in the first place?
-
-SUGG: A map editing mode (similar to dedicated server mode)
-
-SUGG: Transfer more blocks in a single packet
-SUGG: A blockdata combiner class, to which blocks are added and at
- destruction it sends all the stuff in as few packets as possible.
-SUGG: Make a PACKET_COMBINED which contains many subpackets. Utilize
- it by sending more stuff in a single packet.
- - Add a packet queue to RemoteClient, from which packets will be
- combined with object data packets
- - This is not exactly trivial: the object data packets are
- sometimes very big by themselves
- - This might not give much network performance gain though.
-
-SUGG: Precalculate lighting translation table at runtime (at startup)
- - This is not doable because it is currently hand-made and not
- based on some mathematical function.
- - Note: This has been changing lately
-
-SUGG: A version number to blocks, which increments when the block is
- modified (node add/remove, water update, lighting update)
- - This can then be used to make sure the most recent version of
- a block has been sent to client, for example
-
-SUGG: Make the amount of blocks sending to client and the total
- amount of blocks dynamically limited. Transferring blocks is the
- main network eater of this system, so it is the one that has
- to be throttled so that RTTs stay low.
-
-SUGG: Meshes of blocks could be split into 6 meshes facing into
- different directions and then only those drawn that need to be
-
-SUGG: Background music based on cellular automata?
- http://www.earslap.com/projectslab/otomata
-
-SUGG: Simple light color information to air
-
-SUGG: Server-side objects could be moved based on nodes to enable very
- lightweight operation and simple AI
- - Not practical; client would still need to show smooth movement.
-
-SUGG: Make a system for pregenerating quick information for mapblocks, so
- that the client can show them as cubes before they are actually sent
- or even generated.
-
-SUGG: Erosion simulation at map generation time
- - This might be plausible if larger areas of map were pregenerated
- without lighting (which is slow)
- - Simulate water flows, which would carve out dirt fast and
- then turn stone into gravel and sand and relocate it.
- - How about relocating minerals, too? Coal and gold in
- downstream sand and gravel would be kind of cool
- - This would need a better way of handling minerals, mainly
- to have mineral content as a separate field. the first
- parameter field is free for this.
- - Simulate rock falling from cliffs when water has removed
- enough solid rock from the bottom
-
-SUGG: For non-mapgen FarMesh: Add a per-sector database to store surface
- stuff as simple flags/values
- - Light?
- - A building?
- And at some point make the server send this data to the client too,
- instead of referring to the noise functions
- - Ground height
- - Surface ground type
- - Trees?
-
-Gaming ideas:
--------------
-
-- Aim for something like controlling a single dwarf in Dwarf Fortress
-- The player could go faster by a crafting a boat, or riding an animal
-- Random NPC traders. what else?
-
-Game content:
--------------
-
-- When furnace is destroyed, move items to player's inventory
-- Add lots of stuff
-- Glass blocks
-- Growing grass, decaying leaves
- - This can be done in the active blocks I guess.
- - Lots of stuff can be done in the active blocks.
- - Uh, is there an active block list somewhere? I think not. Add it.
-- Breaking weak structures
- - This can probably be accomplished in the same way as grass
-- Player health points
- - When player dies, throw items on map (needs better item-on-map
- implementation)
-- Cobble to get mossy if near water
-- More slots in furnace source list, so that multiple ingredients
- are possible.
-- Keys to chests?
-
-- The Treasure Guard; a big monster with a hammer
- - The hammer does great damage, shakes the ground and removes a block
- - You can drop on top of it, and have some time to attack there
- before he shakes you off
-
-- Maybe the difficulty could come from monsters getting tougher in
- far-away places, and the player starting to need something from
- there when time goes by.
- - The player would have some of that stuff at the beginning, and
- would need new supplies of it when it runs out
-
-- A bomb
-- A spread-items-on-map routine for the bomb, and for dying players
-
-- Fighting:
- - Proper sword swing simulation
- - Player should get damage from colliding to a wall at high speed
-
-Documentation:
---------------
-
-Build system / running:
------------------------
-
-Networking and serialization:
------------------------------
-
-SUGG: Fix address to be ipv6 compatible
-
-User Interface:
----------------
-
-Graphics:
----------
-
-SUGG: Combine MapBlock's face caches to so big pieces that VBO
- can be used
- - That is >500 vertices
- - This is not easy; all the MapBlocks close to the player would
- still need to be drawn separately and combining the blocks
- would have to happen in a background thread
-
-SUGG: Make fetching sector's blocks more efficient when rendering
- sectors that have very large amounts of blocks (on client)
- - Is this necessary at all?
-
-SUGG: Draw cubes in inventory directly with 3D drawing commands, so that
- animating them is easier.
-
-SUGG: Option for enabling proper alpha channel for textures
-
-TODO: Flowing water animation
-
-TODO: A setting for enabling bilinear filtering for textures
-
-TODO: Better control of draw_control.wanted_max_blocks
-
-TODO: Further investigate the use of GPU lighting in addition to the
- current one
-
-TODO: Artificial (night) light could be more yellow colored than sunlight.
- - This is technically doable.
- - Also the actual colors of the textures could be made less colorful
- in the dark but it's a bit more difficult.
-
-SUGG: Somehow make the night less colorful
-
-TODO: Occlusion culling
- - At the same time, move some of the renderMap() block choosing code
- to the same place as where the new culling happens.
- - Shoot some rays per frame and when ready, make a new list of
- blocks for usage of renderMap and give it a new pointer to it.
-
-Configuration:
---------------
-
-Client:
--------
-
-TODO: Untie client network operations from framerate
- - Needs some input queues or something
- - This won't give much performance boost because calculating block
- meshes takes so long
-
-SUGG: Make morning and evening transition more smooth and maybe shorter
-
-TODO: Don't update all meshes always on single node changes, but
- check which ones should be updated
- - implement Map::updateNodeMeshes() and the usage of it
- - It will give almost always a 4x boost in mesh update performance.
-
-- A weapon engine
-
-- Tool/weapon visualization
-
-FIXME: When disconnected to the menu, memory is not freed properly
-
-TODO: Investigate how much the mesh generator thread gets used when
- transferring map data
-
-Server:
--------
-
-SUGG: Make an option to the server to disable building and digging near
- the starting position
-
-FIXME: Server sometimes goes into some infinite PeerNotFoundException loop
-
-* Fix the problem with the server constantly saving one or a few
- blocks? List the first saved block, maybe it explains.
- - It is probably caused by oscillating water
- - TODO: Investigate if this still happens (this is a very old one)
-* Make a small history check to transformLiquids to detect and log
- continuous oscillations, in such detail that they can be fixed.
-
-FIXME: The new optimized map sending doesn't sometimes send enough blocks
- from big caves and such
-FIXME: Block send distance configuration does not take effect for some reason
-
-Environment:
-------------
-
-TODO: Add proper hooks to when adding and removing active blocks
-
-TODO: Finish the ActiveBlockModifier stuff and use it for something
-
-Objects:
---------
-
-TODO: Get rid of MapBlockObjects and use only ActiveObjects
- - Skipping the MapBlockObject data is nasty - there is no "total
- length" stored; have to make a SkipMBOs function which contains
- enough of the current code to skip them properly.
-
-SUGG: MovingObject::move and Player::move are basically the same.
- combine them.
- - NOTE: This is a bit tricky because player has the sneaking ability
- - NOTE: Player::move is more up-to-date.
- - NOTE: There is a simple move implementation now in collision.{h,cpp}
- - NOTE: MovingObject will be deleted (MapBlockObject)
-
-TODO: Add a long step function to objects that is called with the time
- difference when block activates
-
-Map:
-----
-
-TODO: Mineral and ground material properties
- - This way mineral ground toughness can be calculated with just
- some formula, as well as tool strengths. Sounds too.
- - There are TODOs in appropriate files: material.h, content_mapnode.h
-
-TODO: Flowing water to actually contain flow direction information
- - There is a space for this - it just has to be implemented.
-
-TODO: Consider smoothening cave floors after generating them
-
-TODO: Fix make_tree, make_* to use seed-position-consistent pseudorandom
- - delta also
-
-Misc. stuff:
-------------
-TODO: Make sure server handles removing grass when a block is placed (etc)
- - The client should not do it by itself
- - NOTE: I think nobody does it currently...
-TODO: Block cube placement around player's head
-TODO: Protocol version field
-TODO: Think about using same bits for material for fences and doors, for
- example
-TODO: Move mineral to param2, increment map serialization version, add
- conversion
-
-SUGG: Restart irrlicht completely when coming back to main menu from game.
- - This gets rid of everything that is stored in irrlicht's caches.
- - This might be needed for texture pack selection in menu
-
-TODO: Merge bahamada's audio stuff (clean patch available)
-
-TODO: Move content_features to mapnode_content_features.{h,cpp} or so
-
-TODO: Fix item use() stuff; dropping a stack of cooked rats and eating
- it gives 3 hearts and consumes all the rats.
-
-Making it more portable:
-------------------------
-
-Stuff to do before release:
----------------------------
-
-Fixes to the current release:
------------------------------
-
-Stuff to do after release:
----------------------------
-
-Doing currently:
-----------------
-
-======================================================================
-
-*/
-
#ifdef NDEBUG
- #ifdef _WIN32
+ /*#ifdef _WIN32
#pragma message ("Disabling unit tests")
#else
#warning "Disabling unit tests"
- #endif
+ #endif*/
// Disable unit tests
#define ENABLE_TESTS 0
#else
#endif
#ifdef _MSC_VER
+#ifndef SERVER // Dedicated server isn't linked with Irrlicht
#pragma comment(lib, "Irrlicht.lib")
- //#pragma comment(lib, "jthread.lib")
- #pragma comment(lib, "zlibwapi.lib")
- #pragma comment(lib, "Shell32.lib")
// This would get rid of the console window
//#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
#endif
+ #pragma comment(lib, "zlibwapi.lib")
+ #pragma comment(lib, "Shell32.lib")
+#endif
#include "irrlicht.h" // createDevice
#include <iostream>
#include <fstream>
#include <locale.h>
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
#include "debug.h"
#include "test.h"
+#include "clouds.h"
#include "server.h"
#include "constants.h"
#include "porting.h"
#include "gettime.h"
-#include "guiMessageMenu.h"
#include "filesys.h"
#include "config.h"
+#include "version.h"
#include "guiMainMenu.h"
-#include "mineral.h"
-#include "materials.h"
#include "game.h"
#include "keycode.h"
#include "tile.h"
+#include "chat.h"
#include "defaultsettings.h"
#include "gettext.h"
#include "settings.h"
#include "profiler.h"
+#include "log.h"
+#include "mods.h"
+#if USE_FREETYPE
+#include "xCGUITTFont.h"
+#endif
+#include "util/string.h"
+#include "subgame.h"
+#include "quicktune.h"
+#include "serverlist.h"
+#include "httpfetch.h"
+#include "guiEngine.h"
+#include "mapsector.h"
+#include "player.h"
+
+#include "database-sqlite3.h"
+#ifdef USE_LEVELDB
+#include "database-leveldb.h"
+#endif
-// This makes textures
-ITextureSource *g_texturesource = NULL;
+#if USE_REDIS
+#include "database-redis.h"
+#endif
+#ifdef HAVE_TOUCHSCREENGUI
+#include "touchscreengui.h"
+#endif
/*
Settings.
These are loaded from the config file.
*/
Settings main_settings;
Settings *g_settings = &main_settings;
+std::string g_settings_path;
// Global profiler
Profiler main_profiler;
Profiler *g_profiler = &main_profiler;
+// Menu clouds are created later
+Clouds *g_menuclouds = 0;
+irr::scene::ISceneManager *g_menucloudsmgr = 0;
+
/*
- Random stuff
+ Debug streams
*/
+// Connection
+std::ostream *dout_con_ptr = &dummyout;
+std::ostream *derr_con_ptr = &verbosestream;
+
+// Server
+std::ostream *dout_server_ptr = &infostream;
+std::ostream *derr_server_ptr = &errorstream;
+
+// Client
+std::ostream *dout_client_ptr = &infostream;
+std::ostream *derr_client_ptr = &errorstream;
+
+#ifndef SERVER
/*
- mainmenumanager.h
+ Random stuff
*/
+/* mainmenumanager.h */
+
gui::IGUIEnvironment* guienv = NULL;
gui::IGUIStaticText *guiroot = NULL;
MainMenuManager g_menumgr;
// Passed to menus to allow disconnecting and exiting
MainGameCallback *g_gamecallback = NULL;
+#endif
/*
- Debug streams
+ gettime.h implementation
*/
-// Connection
-std::ostream *dout_con_ptr = &dummyout;
-std::ostream *derr_con_ptr = &dstream_no_stderr;
-//std::ostream *dout_con_ptr = &dstream_no_stderr;
-//std::ostream *derr_con_ptr = &dstream_no_stderr;
-//std::ostream *dout_con_ptr = &dstream;
-//std::ostream *derr_con_ptr = &dstream;
+#ifdef SERVER
-// Server
-std::ostream *dout_server_ptr = &dstream;
-std::ostream *derr_server_ptr = &dstream;
+u32 getTimeMs()
+{
+ /* Use imprecise system calls directly (from porting.h) */
+ return porting::getTime(PRECISION_MILLI);
+}
-// Client
-std::ostream *dout_client_ptr = &dstream;
-std::ostream *derr_client_ptr = &dstream;
+u32 getTime(TimePrecision prec)
+{
+ return porting::getTime(prec);
+}
-/*
- gettime.h implementation
-*/
+#else
// A small helper class
class TimeGetter
{
public:
- virtual u32 getTime() = 0;
+ virtual u32 getTime(TimePrecision prec) = 0;
};
// A precise irrlicht one
IrrlichtTimeGetter(IrrlichtDevice *device):
m_device(device)
{}
- u32 getTime()
+ u32 getTime(TimePrecision prec)
{
- if(m_device == NULL)
- return 0;
- return m_device->getTimer()->getRealTime();
+ if (prec == PRECISION_MILLI) {
+ if (m_device == NULL)
+ return 0;
+ return m_device->getTimer()->getRealTime();
+ } else {
+ return porting::getTime(prec);
+ }
}
private:
IrrlichtDevice *m_device;
class SimpleTimeGetter: public TimeGetter
{
public:
- u32 getTime()
+ u32 getTime(TimePrecision prec)
{
- return porting::getTimeMs();
+ return porting::getTime(prec);
}
};
u32 getTimeMs()
{
- if(g_timegetter == NULL)
+ if (g_timegetter == NULL)
return 0;
- return g_timegetter->getTime();
+ return g_timegetter->getTime(PRECISION_MILLI);
}
+u32 getTime(TimePrecision prec) {
+ if (g_timegetter == NULL)
+ return 0;
+ return g_timegetter->getTime(prec);
+}
+#endif
+
+class StderrLogOutput: public ILogOutput
+{
+public:
+ /* line: Full line with timestamp, level and thread */
+ void printLog(const std::string &line)
+ {
+ std::cerr << line << std::endl;
+ }
+} main_stderr_log_out;
+
+class DstreamNoStderrLogOutput: public ILogOutput
+{
+public:
+ /* line: Full line with timestamp, level and thread */
+ void printLog(const std::string &line)
+ {
+ dstream_no_stderr << line << std::endl;
+ }
+} main_dstream_no_stderr_log_out;
+
+#ifndef SERVER
+
/*
Event handler for Irrlicht
/*
React to nothing here if a menu is active
*/
- if(noMenuActive() == false)
- {
- return false;
+ if (noMenuActive() == false) {
+#ifdef HAVE_TOUCHSCREENGUI
+ if (m_touchscreengui != 0) {
+ m_touchscreengui->Toggle(false);
+ }
+#endif
+ return g_menumgr.preprocessEvent(event);
}
// Remember whether each key is down or up
- if(event.EventType == irr::EET_KEY_INPUT_EVENT)
- {
- if(event.KeyInput.PressedDown) {
+ if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
+ if (event.KeyInput.PressedDown) {
keyIsDown.set(event.KeyInput);
keyWasDown.set(event.KeyInput);
} else {
}
}
- if(event.EventType == irr::EET_MOUSE_INPUT_EVENT)
- {
- if(noMenuActive() == false)
- {
+#ifdef HAVE_TOUCHSCREENGUI
+ // case of touchscreengui we have to handle different events
+ if ((m_touchscreengui != 0) &&
+ (event.EventType == irr::EET_TOUCH_INPUT_EVENT)) {
+ m_touchscreengui->translateEvent(event);
+ return true;
+ }
+#endif
+ // handle mouse events
+ if(event.EventType == irr::EET_MOUSE_INPUT_EVENT) {
+ if (noMenuActive() == false) {
left_active = false;
middle_active = false;
right_active = false;
- }
- else
- {
- //dstream<<"MyEventReceiver: mouse input"<<std::endl;
+ } else {
left_active = event.MouseInput.isLeftPressed();
middle_active = event.MouseInput.isMiddlePressed();
right_active = event.MouseInput.isRightPressed();
- if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
- {
+ if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
leftclicked = true;
}
- if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
- {
+ if (event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) {
rightclicked = true;
}
- if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
- {
+ if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) {
leftreleased = true;
}
- if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP)
- {
+ if (event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP) {
rightreleased = true;
}
- if(event.MouseInput.Event == EMIE_MOUSE_WHEEL)
- {
+ if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) {
mouse_wheel += event.MouseInput.Wheel;
}
}
}
-
+ if(event.EventType == irr::EET_LOG_TEXT_EVENT) {
+ dstream<< std::string("Irrlicht log: ") + std::string(event.LogEvent.Text)<<std::endl;
+ return true;
+ }
+ /* always return false in order to continue processing events */
return false;
}
{
return keyIsDown[keyCode];
}
-
+
// Checks whether a key was down and resets the state
bool WasKeyDown(const KeyPress &keyCode)
{
MyEventReceiver()
{
clearInput();
+#ifdef HAVE_TOUCHSCREENGUI
+ m_touchscreengui = NULL;
+#endif
}
bool leftclicked;
s32 mouse_wheel;
+#ifdef HAVE_TOUCHSCREENGUI
+ TouchScreenGUI* m_touchscreengui;
+#endif
+
private:
- IrrlichtDevice *m_device;
-
// The current state of keys
KeyList keyIsDown;
// Whether a key has been pressed or not
public:
RealInputHandler(IrrlichtDevice *device, MyEventReceiver *receiver):
m_device(device),
- m_receiver(receiver)
+ m_receiver(receiver),
+ m_mousepos(0,0)
{
}
virtual bool isKeyDown(const KeyPress &keyCode)
}
virtual v2s32 getMousePos()
{
- return m_device->getCursorControl()->getPosition();
+ if (m_device->getCursorControl()) {
+ return m_device->getCursorControl()->getPosition();
+ }
+ else {
+ return m_mousepos;
+ }
}
virtual void setMousePos(s32 x, s32 y)
{
- m_device->getCursorControl()->setPosition(x, y);
+ if (m_device->getCursorControl()) {
+ m_device->getCursorControl()->setPosition(x, y);
+ }
+ else {
+ m_mousepos = v2s32(x,y);
+ }
}
virtual bool getLeftState()
{
return m_receiver->right_active;
}
-
+
virtual bool getLeftClicked()
{
return m_receiver->leftclicked;
m_receiver->clearInput();
}
private:
- IrrlichtDevice *m_device;
+ IrrlichtDevice *m_device;
MyEventReceiver *m_receiver;
+ v2s32 m_mousepos;
};
class RandomInputHandler : public InputHandler
}
virtual void setMousePos(s32 x, s32 y)
{
- mousepos = v2s32(x,y);
+ mousepos = v2s32(x, y);
}
virtual bool getLeftState()
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 40);
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 40);
keydown.toggle(getKeySetting("keymap_jump"));
}
}
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 40);
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 40);
keydown.toggle(getKeySetting("keymap_special1"));
}
}
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 40);
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 40);
keydown.toggle(getKeySetting("keymap_forward"));
}
}
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 40);
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 40);
keydown.toggle(getKeySetting("keymap_left"));
}
}
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 20);
- mousespeed = v2s32(Rand(-20,20), Rand(-15,20));
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 20);
+ mousespeed = v2s32(Rand(-20, 20), Rand(-15, 20));
}
}
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 30);
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 30);
leftdown = !leftdown;
- if(leftdown)
+ if (leftdown)
leftclicked = true;
- if(!leftdown)
+ if (!leftdown)
leftreleased = true;
}
}
{
static float counter1 = 0;
counter1 -= dtime;
- if(counter1 < 0.0)
- {
- counter1 = 0.1*Rand(1, 15);
+ if (counter1 < 0.0) {
+ counter1 = 0.1 * Rand(1, 15);
rightdown = !rightdown;
- if(rightdown)
+ if (rightdown)
rightclicked = true;
- if(!rightdown)
+ if (!rightdown)
rightreleased = true;
}
}
bool rightreleased;
};
+#endif // !SERVER
+
// These are defined global so that they're not optimized too much.
// Can't change them to volatile.
s16 temp16;
void SpeedTests()
{
{
- dstream<<"The following test should take around 20ms."<<std::endl;
+ infostream << "The following test should take around 20ms." << std::endl;
TimeTaker timer("Testing std::string speed");
const u32 jj = 10000;
- for(u32 j=0; j<jj; j++)
- {
+ for(u32 j = 0; j < jj; j++) {
tempstring = "";
tempstring2 = "";
const u32 ii = 10;
- for(u32 i=0; i<ii; i++){
+ for(u32 i = 0; i < ii; i++) {
tempstring2 += "asd";
}
- for(u32 i=0; i<ii+1; i++){
+ for(u32 i = 0; i < ii+1; i++) {
tempstring += "asd";
- if(tempstring == tempstring2)
+ if (tempstring == tempstring2)
break;
}
}
}
-
- dstream<<"All of the following tests should take around 100ms each."
- <<std::endl;
+
+ infostream << "All of the following tests should take around 100ms each."
+ << std::endl;
{
TimeTaker timer("Testing floating-point conversion speed");
tempf = 0.001;
- for(u32 i=0; i<4000000; i++){
+ for(u32 i = 0; i < 4000000; i++) {
temp16 += tempf;
tempf += 0.001;
}
}
-
+
{
TimeTaker timer("Testing floating-point vector speed");
- tempv3f1 = v3f(1,2,3);
- tempv3f2 = v3f(4,5,6);
- for(u32 i=0; i<10000000; i++){
+ tempv3f1 = v3f(1, 2, 3);
+ tempv3f2 = v3f(4, 5, 6);
+ for(u32 i = 0; i < 10000000; i++) {
tempf += tempv3f1.dotProduct(tempv3f2);
- tempv3f2 += v3f(7,8,9);
+ tempv3f2 += v3f(7, 8, 9);
}
}
{
- TimeTaker timer("Testing core::map speed");
-
- core::map<v2s16, f32> map1;
+ TimeTaker timer("Testing std::map speed");
+
+ std::map<v2s16, f32> map1;
tempf = -324;
- const s16 ii=300;
- for(s16 y=0; y<ii; y++){
- for(s16 x=0; x<ii; x++){
- map1.insert(v2s16(x,y), tempf);
+ const s16 ii = 300;
+ for(s16 y = 0; y < ii; y++) {
+ for(s16 x = 0; x < ii; x++) {
+ map1[v2s16(x, y)] = tempf;
tempf += 1;
}
}
- for(s16 y=ii-1; y>=0; y--){
- for(s16 x=0; x<ii; x++){
- tempf = map1[v2s16(x,y)];
+ for(s16 y = ii - 1; y >= 0; y--) {
+ for(s16 x = 0; x < ii; x++) {
+ tempf = map1[v2s16(x, y)];
}
}
}
{
- dstream<<"Around 5000/ms should do well here."<<std::endl;
+ infostream << "Around 5000/ms should do well here." << std::endl;
TimeTaker timer("Testing mutex speed");
-
+
JMutex m;
- m.Init();
u32 n = 0;
u32 i = 0;
- do{
+ do {
n += 10000;
- for(; i<n; i++){
+ for(; i < n; i++) {
m.Lock();
m.Unlock();
}
}
// Do at least 10ms
- while(timer.getTime() < 10);
+ while(timer.getTimerTime() < 10);
u32 dtime = timer.stop();
u32 per_ms = n / dtime;
- std::cout<<"Done. "<<dtime<<"ms, "
- <<per_ms<<"/ms"<<std::endl;
+ infostream << "Done. " << dtime << "ms, " << per_ms << "/ms" << std::endl;
}
}
-void drawMenuBackground(video::IVideoDriver* driver)
+static void print_worldspecs(const std::vector<WorldSpec> &worldspecs, std::ostream &os)
{
- core::dimension2d<u32> screensize = driver->getScreenSize();
-
- video::ITexture *bgtexture =
- driver->getTexture(getTexturePath("mud.png").c_str());
- if(bgtexture)
- {
- s32 texturesize = 128;
- s32 tiled_y = screensize.Height / texturesize + 1;
- s32 tiled_x = screensize.Width / texturesize + 1;
-
- for(s32 y=0; y<tiled_y; y++)
- for(s32 x=0; x<tiled_x; x++)
- {
- core::rect<s32> rect(0,0,texturesize,texturesize);
- rect += v2s32(x*texturesize, y*texturesize);
- driver->draw2DImage(bgtexture, rect,
- core::rect<s32>(core::position2d<s32>(0,0),
- core::dimension2di(bgtexture->getSize())),
- NULL, NULL, true);
- }
- }
-
- video::ITexture *logotexture =
- driver->getTexture(getTexturePath("menulogo.png").c_str());
- if(logotexture)
- {
- v2s32 logosize(logotexture->getOriginalSize().Width,
- logotexture->getOriginalSize().Height);
- logosize *= 4;
-
- video::SColor bgcolor(255,50,50,50);
- core::rect<s32> bgrect(0, screensize.Height-logosize.Y-20,
- screensize.Width, screensize.Height);
- driver->draw2DRectangle(bgcolor, bgrect, NULL);
-
- core::rect<s32> rect(0,0,logosize.X,logosize.Y);
- rect += v2s32(screensize.Width/2,screensize.Height-10-logosize.Y);
- rect -= v2s32(logosize.X/2, 0);
- driver->draw2DImage(logotexture, rect,
- core::rect<s32>(core::position2d<s32>(0,0),
- core::dimension2di(logotexture->getSize())),
- NULL, NULL, true);
+ for(u32 i = 0; i < worldspecs.size(); i++) {
+ std::string name = worldspecs[i].name;
+ std::string path = worldspecs[i].path;
+ if (name.find(" ") != std::string::npos)
+ name = std::string("'") + name + "'";
+ path = std::string("'") + path + "'";
+ name = padStringRight(name, 14);
+ os << " " << name << " " << path << std::endl;
}
}
int main(int argc, char *argv[])
{
+ int retval = 0;
+
/*
Initialization
*/
- // Set locale. This is for forcing '.' as the decimal point.
- std::locale::global(std::locale("C"));
- // This enables printing all characters in bitmap font
- setlocale(LC_CTYPE, "en_US");
+ log_add_output_maxlev(&main_stderr_log_out, LMT_ACTION);
+ log_add_output_all_levs(&main_dstream_no_stderr_log_out);
+ log_register_thread("main");
/*
Parse command line
*/
-
+
// List all allowed options
- core::map<std::string, ValueSpec> allowed_options;
- allowed_options.insert("help", ValueSpec(VALUETYPE_FLAG));
- allowed_options.insert("server", ValueSpec(VALUETYPE_FLAG,
- "Run server directly"));
- allowed_options.insert("config", ValueSpec(VALUETYPE_STRING,
- "Load configuration from specified file"));
- allowed_options.insert("port", ValueSpec(VALUETYPE_STRING));
- allowed_options.insert("address", ValueSpec(VALUETYPE_STRING));
- allowed_options.insert("random-input", ValueSpec(VALUETYPE_FLAG));
- allowed_options.insert("disable-unittests", ValueSpec(VALUETYPE_FLAG));
- allowed_options.insert("enable-unittests", ValueSpec(VALUETYPE_FLAG));
- allowed_options.insert("map-dir", ValueSpec(VALUETYPE_STRING));
-#ifdef _WIN32
- allowed_options.insert("dstream-on-stderr", ValueSpec(VALUETYPE_FLAG));
+ std::map<std::string, ValueSpec> allowed_options;
+ allowed_options.insert(std::make_pair("help", ValueSpec(VALUETYPE_FLAG,
+ _("Show allowed options"))));
+ allowed_options.insert(std::make_pair("version", ValueSpec(VALUETYPE_FLAG,
+ _("Show version information"))));
+ allowed_options.insert(std::make_pair("config", ValueSpec(VALUETYPE_STRING,
+ _("Load configuration from specified file"))));
+ allowed_options.insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING,
+ _("Set network port (UDP)"))));
+ allowed_options.insert(std::make_pair("disable-unittests", ValueSpec(VALUETYPE_FLAG,
+ _("Disable unit tests"))));
+ allowed_options.insert(std::make_pair("enable-unittests", ValueSpec(VALUETYPE_FLAG,
+ _("Enable unit tests"))));
+ allowed_options.insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
+ _("Same as --world (deprecated)"))));
+ allowed_options.insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
+ _("Set world path (implies local game) ('list' lists all)"))));
+ allowed_options.insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING,
+ _("Set world by name (implies local game)"))));
+ allowed_options.insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG,
+ _("Print to console errors only"))));
+ allowed_options.insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG,
+ _("Print more information to console"))));
+ allowed_options.insert(std::make_pair("verbose", ValueSpec(VALUETYPE_FLAG,
+ _("Print even more information to console"))));
+ allowed_options.insert(std::make_pair("trace", ValueSpec(VALUETYPE_FLAG,
+ _("Print enormous amounts of information to log and console"))));
+ allowed_options.insert(std::make_pair("logfile", ValueSpec(VALUETYPE_STRING,
+ _("Set logfile path ('' = no logging)"))));
+ allowed_options.insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING,
+ _("Set gameid (\"--gameid list\" prints available ones)"))));
+ allowed_options.insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING,
+ _("Migrate from current map backend to another (Only works when using minetestserver or with --server)"))));
+#ifndef SERVER
+ allowed_options.insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
+ _("Show available video modes"))));
+ allowed_options.insert(std::make_pair("speedtests", ValueSpec(VALUETYPE_FLAG,
+ _("Run speed tests"))));
+ allowed_options.insert(std::make_pair("address", ValueSpec(VALUETYPE_STRING,
+ _("Address to connect to. ('' = local game)"))));
+ allowed_options.insert(std::make_pair("random-input", ValueSpec(VALUETYPE_FLAG,
+ _("Enable random user input, for testing"))));
+ allowed_options.insert(std::make_pair("server", ValueSpec(VALUETYPE_FLAG,
+ _("Run dedicated server"))));
+ allowed_options.insert(std::make_pair("name", ValueSpec(VALUETYPE_STRING,
+ _("Set player name"))));
+ allowed_options.insert(std::make_pair("password", ValueSpec(VALUETYPE_STRING,
+ _("Set password"))));
+ allowed_options.insert(std::make_pair("go", ValueSpec(VALUETYPE_FLAG,
+ _("Disable main menu"))));
#endif
- allowed_options.insert("speedtests", ValueSpec(VALUETYPE_FLAG));
Settings cmd_args;
-
- bool ret = cmd_args.parseCommandLine(argc, argv, allowed_options);
- if(ret == false || cmd_args.getFlag("help"))
- {
- dstream<<"Allowed options:"<<std::endl;
- for(core::map<std::string, ValueSpec>::Iterator
- i = allowed_options.getIterator();
- i.atEnd() == false; i++)
- {
- dstream<<" --"<<i.getNode()->getKey();
- if(i.getNode()->getValue().type == VALUETYPE_FLAG)
- {
- }
- else
- {
- dstream<<" <value>";
- }
- dstream<<std::endl;
+ bool ret = cmd_args.parseCommandLine(argc, argv, allowed_options);
- if(i.getNode()->getValue().help != NULL)
- {
- dstream<<" "<<i.getNode()->getValue().help
- <<std::endl;
- }
+ if (ret == false || cmd_args.getFlag("help") || cmd_args.exists("nonopt1")) {
+ dstream << _("Allowed options:") << std::endl;
+ for(std::map<std::string, ValueSpec>::iterator
+ i = allowed_options.begin();
+ i != allowed_options.end(); ++i) {
+ std::ostringstream os1(std::ios::binary);
+ os1 << " --"<<i->first;
+ if (i->second.type == VALUETYPE_FLAG) {
+ } else
+ os1 << _(" <value>");
+ dstream << padStringRight(os1.str(), 24);
+
+ if (i->second.help != NULL)
+ dstream << i->second.help;
+ dstream << std::endl;
}
return cmd_args.getFlag("help") ? 0 : 1;
}
-
+
+ if (cmd_args.getFlag("version")) {
+#ifdef SERVER
+ dstream << "minetestserver " << minetest_version_hash << std::endl;
+#else
+ dstream << "Minetest " << minetest_version_hash << std::endl;
+ dstream << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
+#endif
+ dstream << "Build info: " << minetest_build_info << std::endl;
+ return 0;
+ }
+
/*
Low-level initialization
*/
- bool disable_stderr = false;
-#ifdef _WIN32
- if(cmd_args.getFlag("dstream-on-stderr") == false)
- disable_stderr = true;
-#endif
+ // Quiet mode, print errors only
+ if (cmd_args.getFlag("quiet")) {
+ log_remove_output(&main_stderr_log_out);
+ log_add_output_maxlev(&main_stderr_log_out, LMT_ERROR);
+ }
+ // If trace is enabled, enable logging of certain things
+ if (cmd_args.getFlag("trace")) {
+ dstream << _("Enabling trace level debug output") << std::endl;
+ log_trace_level_enabled = true;
+ dout_con_ptr = &verbosestream; // this is somewhat old crap
+ socket_enable_debug_output = true; // socket doesn't use log.h
+ }
+ // In certain cases, output info level on stderr
+ if (cmd_args.getFlag("info") || cmd_args.getFlag("verbose") ||
+ cmd_args.getFlag("trace") || cmd_args.getFlag("speedtests"))
+ log_add_output(&main_stderr_log_out, LMT_INFO);
+ // In certain cases, output verbose level on stderr
+ if (cmd_args.getFlag("verbose") || cmd_args.getFlag("trace"))
+ log_add_output(&main_stderr_log_out, LMT_VERBOSE);
porting::signal_handler_init();
bool &kill = *porting::signal_handler_killstatus();
-
- // Initialize porting::path_data and porting::path_userdata
+
porting::initializePaths();
- // Create user data directory
- fs::CreateDir(porting::path_userdata);
+#ifdef __ANDROID__
+ porting::initAndroid();
- init_gettext((porting::path_data+"/../locale").c_str());
-
- // Initialize debug streams
-#ifdef RUN_IN_PLACE
- std::string debugfile = DEBUGFILE;
+ porting::setExternalStorageDir(porting::jnienv);
+ if (!fs::PathExists(porting::path_user)) {
+ fs::CreateDir(porting::path_user);
+ }
+ porting::copyAssets();
#else
- std::string debugfile = porting::path_userdata+"/"+DEBUGFILE;
+ // Create user data directory
+ fs::CreateDir(porting::path_user);
#endif
- debugstreams_init(disable_stderr, debugfile.c_str());
+
+ infostream << "path_share = " << porting::path_share << std::endl;
+ infostream << "path_user = " << porting::path_user << std::endl;
+
// Initialize debug stacks
debug_stacks_init();
-
DSTACK(__FUNCTION_NAME);
- // Init material properties table
- //initializeMaterialProperties();
-
// Debug handler
BEGIN_DEBUG_EXCEPTION_HANDLER
+ // List gameids if requested
+ if (cmd_args.exists("gameid") && cmd_args.get("gameid") == "list") {
+ std::set<std::string> gameids = getAvailableGameIds();
+ for(std::set<std::string>::const_iterator i = gameids.begin();
+ i != gameids.end(); i++)
+ dstream<<(*i)<<std::endl;
+ return 0;
+ }
+
+ // List worlds if requested
+ if (cmd_args.exists("world") && cmd_args.get("world") == "list") {
+ dstream << _("Available worlds:") << std::endl;
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+ print_worldspecs(worldspecs, dstream);
+ return 0;
+ }
+
// Print startup message
- dstream<<DTIME<<PROJECT_NAME
- " with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
- <<", "<<BUILD_INFO
- <<std::endl;
-
+ infostream<<PROJECT_NAME << " "<< _("with") << " SER_FMT_VER_HIGHEST_READ="
+ << (int)SER_FMT_VER_HIGHEST_READ << ", " << minetest_build_info << std::endl;
+
/*
Basic initialization
*/
// Initialize default settings
set_default_settings(g_settings);
-
+
// Initialize sockets
sockets_init();
atexit(sockets_cleanup);
-
+
/*
Read config file
*/
-
+
// Path of configuration file in use
- std::string configpath = "";
-
- if(cmd_args.exists("config"))
- {
+ g_settings_path = "";
+
+ if (cmd_args.exists("config")) {
bool r = g_settings->readConfigFile(cmd_args.get("config").c_str());
- if(r == false)
- {
- dstream<<"Could not read configuration from \""
- <<cmd_args.get("config")<<"\""<<std::endl;
+ if (r == false) {
+ errorstream << "Could not read configuration from \""
+ << cmd_args.get("config") << "\"" << std::endl;
return 1;
}
- configpath = cmd_args.get("config");
- }
- else
- {
- core::array<std::string> filenames;
- filenames.push_back(porting::path_userdata + "/minetest.conf");
-#ifdef RUN_IN_PLACE
- filenames.push_back(porting::path_userdata + "/../minetest.conf");
+ g_settings_path = cmd_args.get("config");
+ } else {
+ std::vector<std::string> filenames;
+ filenames.push_back(porting::path_user +
+ DIR_DELIM + "minetest.conf");
+ // Legacy configuration file location
+ filenames.push_back(porting::path_user +
+ DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
+#if RUN_IN_PLACE
+ // Try also from a lower level (to aid having the same configuration
+ // for many RUN_IN_PLACE installs)
+ filenames.push_back(porting::path_user +
+ DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
#endif
- for(u32 i=0; i<filenames.size(); i++)
- {
+ for(u32 i = 0; i < filenames.size(); i++) {
bool r = g_settings->readConfigFile(filenames[i].c_str());
- if(r)
- {
- configpath = filenames[i];
+ if (r) {
+ g_settings_path = filenames[i];
break;
}
}
-
+
// If no path found, use the first one (menu creates the file)
- if(configpath == "")
- configpath = filenames[0];
+ if (g_settings_path == "")
+ g_settings_path = filenames[0];
}
+ // Initialize debug streams
+#define DEBUGFILE "debug.txt"
+#if RUN_IN_PLACE
+ std::string logfile = DEBUGFILE;
+#else
+ std::string logfile = porting::path_user+DIR_DELIM+DEBUGFILE;
+#endif
+ if (cmd_args.exists("logfile"))
+ logfile = cmd_args.get("logfile");
+
+ log_remove_output(&main_dstream_no_stderr_log_out);
+ int loglevel = g_settings->getS32("debug_log_level");
+
+ if (loglevel == 0) //no logging
+ logfile = "";
+ else if (loglevel > 0 && loglevel <= LMT_NUM_VALUES)
+ log_add_output_maxlev(&main_dstream_no_stderr_log_out,
+ (LogMessageLevel)(loglevel - 1));
+
+ if (logfile != "")
+ debugstreams_init(false, logfile.c_str());
+ else
+ debugstreams_init(false, NULL);
+
+ infostream << "logfile = " << logfile << std::endl;
+
// Initialize random seed
srand(time(0));
mysrand(time(0));
- /*
- Pre-initialize some stuff with a dummy irrlicht wrapper.
-
- These are needed for unit tests at least.
- */
-
- // Initial call with g_texturesource not set.
- init_mapnode();
+ // Initialize HTTP fetcher
+ httpfetch_init(g_settings->getS32("curl_parallel_limit"));
+#ifndef __ANDROID__
/*
Run unit tests
*/
-
- if((ENABLE_TESTS && cmd_args.getFlag("disable-unittests") == false)
- || cmd_args.getFlag("enable-unittests") == true)
- {
- run_tests();
- }
-
- /*for(s16 y=-100; y<100; y++)
- for(s16 x=-100; x<100; x++)
- {
- std::cout<<noise2d_gradient((double)x/10,(double)y/10, 32415)<<std::endl;
+ if ((ENABLE_TESTS && cmd_args.getFlag("disable-unittests") == false)
+ || cmd_args.getFlag("enable-unittests") == true) {
+ run_tests();
}
- return 0;*/
-
+#endif
+#ifdef _MSC_VER
+ init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
+ g_settings->get("language"), argc, argv);
+#else
+ init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
+ g_settings->get("language"));
+#endif
+
/*
Game parameters
*/
// Port
u16 port = 30000;
- if(cmd_args.exists("port"))
+ if (cmd_args.exists("port"))
port = cmd_args.getU16("port");
- else if(g_settings->exists("port"))
+ else if (g_settings->exists("port"))
port = g_settings->getU16("port");
- if(port == 0)
+ if (port == 0)
port = 30000;
-
- // Map directory
- std::string map_dir = porting::path_userdata+"/world";
- if(cmd_args.exists("map-dir"))
- map_dir = cmd_args.get("map-dir");
- else if(g_settings->exists("map-dir"))
- map_dir = g_settings->get("map-dir");
-
- // Run dedicated server if asked to
- if(cmd_args.getFlag("server"))
+
+ // World directory
+ std::string commanded_world = "";
+ if (cmd_args.exists("world"))
+ commanded_world = cmd_args.get("world");
+ else if (cmd_args.exists("map-dir"))
+ commanded_world = cmd_args.get("map-dir");
+ else if (cmd_args.exists("nonopt0")) // First nameless argument
+ commanded_world = cmd_args.get("nonopt0");
+ else if (g_settings->exists("map-dir"))
+ commanded_world = g_settings->get("map-dir");
+
+ // World name
+ std::string commanded_worldname = "";
+ if (cmd_args.exists("worldname"))
+ commanded_worldname = cmd_args.get("worldname");
+
+ // Strip world.mt from commanded_world
{
- DSTACK("Dedicated server branch");
+ std::string worldmt = "world.mt";
+ if (commanded_world.size() > worldmt.size() &&
+ commanded_world.substr(commanded_world.size() - worldmt.size())
+ == worldmt) {
+ dstream << _("Supplied world.mt file - stripping it off.") << std::endl;
+ commanded_world = commanded_world.substr(0,
+ commanded_world.size() - worldmt.size());
+ }
+ }
+
+ // If a world name was specified, convert it to a path
+ if (commanded_worldname != "") {
+ // Get information about available worlds
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+ bool found = false;
+ for(u32 i = 0; i < worldspecs.size(); i++) {
+ std::string name = worldspecs[i].name;
+ if (name == commanded_worldname) {
+ if (commanded_world != "") {
+ dstream << _("--worldname takes precedence over previously "
+ "selected world.") << std::endl;
+ }
+ commanded_world = worldspecs[i].path;
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ dstream << _("World") << " '"<<commanded_worldname << _("' not "
+ "available. Available worlds:") << std::endl;
+ print_worldspecs(worldspecs, dstream);
+ return 1;
+ }
+ }
+
+ // Gamespec
+ SubgameSpec commanded_gamespec;
+ if (cmd_args.exists("gameid")) {
+ std::string gameid = cmd_args.get("gameid");
+ commanded_gamespec = findSubgame(gameid);
+ if (!commanded_gamespec.isValid()) {
+ errorstream << "Game \"" << gameid << "\" not found" << std::endl;
+ return 1;
+ }
+ }
+
- // Create time getter
+ /*
+ Run dedicated server if asked to or no other option
+ */
+#ifdef SERVER
+ bool run_dedicated_server = true;
+#else
+ bool run_dedicated_server = cmd_args.getFlag("server");
+#endif
+ g_settings->set("server_dedicated", run_dedicated_server ? "true" : "false");
+ if (run_dedicated_server)
+ {
+ DSTACK("Dedicated server branch");
+ // Create time getter if built with Irrlicht
+#ifndef SERVER
g_timegetter = new SimpleTimeGetter();
-
+#endif
+
+ // World directory
+ std::string world_path;
+ verbosestream << _("Determining world path") << std::endl;
+ bool is_legacy_world = false;
+ // If a world was commanded, use it
+ if (commanded_world != "") {
+ world_path = commanded_world;
+ infostream << "Using commanded world path [" << world_path << "]"
+ << std::endl;
+ } else { // No world was specified; try to select it automatically
+ // Get information about available worlds
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+ // If a world name was specified, select it
+ if (commanded_worldname != "") {
+ world_path = "";
+ for(u32 i = 0; i < worldspecs.size(); i++) {
+ std::string name = worldspecs[i].name;
+ if (name == commanded_worldname) {
+ world_path = worldspecs[i].path;
+ break;
+ }
+ }
+ if (world_path == "") {
+ dstream << _("World") << " '" << commanded_worldname << "' " << _("not "
+ "available. Available worlds:") << std::endl;
+ print_worldspecs(worldspecs, dstream);
+ return 1;
+ }
+ }
+ // If there is only a single world, use it
+ if (worldspecs.size() == 1) {
+ world_path = worldspecs[0].path;
+ dstream <<_("Automatically selecting world at") << " ["
+ << world_path << "]" << std::endl;
+ // If there are multiple worlds, list them
+ } else if (worldspecs.size() > 1) {
+ dstream << _("Multiple worlds are available.") << std::endl;
+ dstream << _("Please select one using --worldname <name>"
+ " or --world <path>") << std::endl;
+ print_worldspecs(worldspecs, dstream);
+ return 1;
+ // If there are no worlds, automatically create a new one
+ } else {
+ // This is the ultimate default world path
+ world_path = porting::path_user + DIR_DELIM + "worlds" +
+ DIR_DELIM + "world";
+ infostream << "Creating default world at ["
+ << world_path << "]" << std::endl;
+ }
+ }
+
+ if (world_path == "") {
+ errorstream << "No world path specified or found." << std::endl;
+ return 1;
+ }
+ verbosestream << _("Using world path") << " [" << world_path << "]" << std::endl;
+
+ // We need a gamespec.
+ SubgameSpec gamespec;
+ verbosestream << _("Determining gameid/gamespec") << std::endl;
+ // If world doesn't exist
+ if (!getWorldExists(world_path)) {
+ // Try to take gamespec from command line
+ if (commanded_gamespec.isValid()) {
+ gamespec = commanded_gamespec;
+ infostream << "Using commanded gameid [" << gamespec.id << "]" << std::endl;
+ } else { // Otherwise we will be using "minetest"
+ gamespec = findSubgame(g_settings->get("default_game"));
+ infostream << "Using default gameid [" << gamespec.id << "]" << std::endl;
+ }
+ } else { // World exists
+ std::string world_gameid = getWorldGameId(world_path, is_legacy_world);
+ // If commanded to use a gameid, do so
+ if (commanded_gamespec.isValid()) {
+ gamespec = commanded_gamespec;
+ if (commanded_gamespec.id != world_gameid) {
+ errorstream << "WARNING: Using commanded gameid ["
+ << gamespec.id << "]" << " instead of world gameid ["
+ << world_gameid << "]" << std::endl;
+ }
+ } else {
+ // If world contains an embedded game, use it;
+ // Otherwise find world from local system.
+ gamespec = findWorldSubgame(world_path);
+ infostream << "Using world gameid [" << gamespec.id << "]" << std::endl;
+ }
+ }
+ if (!gamespec.isValid()) {
+ errorstream << "Subgame [" << gamespec.id << "] could not be found."
+ << std::endl;
+ return 1;
+ }
+ verbosestream << _("Using gameid") << " [" << gamespec.id<<"]" << std::endl;
+
+ // Bind address
+ std::string bind_str = g_settings->get("bind_address");
+ Address bind_addr(0, 0, 0, 0, port);
+
+ if (g_settings->getBool("ipv6_server")) {
+ bind_addr.setAddress((IPv6AddressBytes*) NULL);
+ }
+ try {
+ bind_addr.Resolve(bind_str.c_str());
+ } catch (ResolveError &e) {
+ infostream << "Resolving bind address \"" << bind_str
+ << "\" failed: " << e.what()
+ << " -- Listening on all addresses." << std::endl;
+ }
+ if (bind_addr.isIPv6() && !g_settings->getBool("enable_ipv6")) {
+ errorstream << "Unable to listen on "
+ << bind_addr.serializeString()
+ << L" because IPv6 is disabled" << std::endl;
+ return 1;
+ }
+
// Create server
- Server server(map_dir.c_str(), configpath);
- server.start(port);
-
+ Server server(world_path, gamespec, false, bind_addr.isIPv6());
+
+ // Database migration
+ if (cmd_args.exists("migrate")) {
+ std::string migrate_to = cmd_args.get("migrate");
+ Settings world_mt;
+ bool success = world_mt.readConfigFile((world_path + DIR_DELIM
+ + "world.mt").c_str());
+ if (!success) {
+ errorstream << "Cannot read world.mt" << std::endl;
+ return 1;
+ }
+ if (!world_mt.exists("backend")) {
+ errorstream << "Please specify your current backend in world.mt file:"
+ << std::endl << " backend = {sqlite3|leveldb|redis|dummy}" << std::endl;
+ return 1;
+ }
+ std::string backend = world_mt.get("backend");
+ Database *new_db;
+ if (backend == migrate_to) {
+ errorstream << "Cannot migrate: new backend is same"
+ <<" as the old one" << std::endl;
+ return 1;
+ }
+ if (migrate_to == "sqlite3")
+ new_db = new Database_SQLite3(&(ServerMap&)server.getMap(), world_path);
+ #if USE_LEVELDB
+ else if (migrate_to == "leveldb")
+ new_db = new Database_LevelDB(&(ServerMap&)server.getMap(), world_path);
+ #endif
+ #if USE_REDIS
+ else if (migrate_to == "redis")
+ new_db = new Database_Redis(&(ServerMap&)server.getMap(), world_path);
+ #endif
+ else {
+ errorstream << "Migration to " << migrate_to
+ << " is not supported" << std::endl;
+ return 1;
+ }
+
+ std::list<v3s16> blocks;
+ ServerMap &old_map = ((ServerMap&)server.getMap());
+ old_map.listAllLoadableBlocks(blocks);
+ int count = 0;
+ new_db->beginSave();
+ for (std::list<v3s16>::iterator i = blocks.begin(); i != blocks.end(); i++) {
+ MapBlock *block = old_map.loadBlock(*i);
+ if (!block) {
+ errorstream << "Failed to load block " << PP(*i) << ", skipping it.";
+ } else {
+ old_map.saveBlock(block, new_db);
+ MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z));
+ sector->deleteBlock(block);
+ }
+ ++count;
+ if (count % 500 == 0)
+ actionstream << "Migrated " << count << " blocks "
+ << (100.0 * count / blocks.size()) << "% completed" << std::endl;
+ }
+ new_db->endSave();
+ delete new_db;
+
+ actionstream << "Successfully migrated " << count << " blocks" << std::endl;
+ world_mt.set("backend", migrate_to);
+ if (!world_mt.updateConfigFile((world_path + DIR_DELIM + "world.mt").c_str()))
+ errorstream << "Failed to update world.mt!" << std::endl;
+ else
+ actionstream << "world.mt updated" << std::endl;
+
+ return 0;
+ }
+
+ server.start(bind_addr);
+
// Run server
dedicated_server_loop(server, kill);
return 0;
}
+#ifndef SERVER // Exclude from dedicated server build
/*
More parameters
*/
-
- // Address to connect to
- std::string address = "";
-
- if(cmd_args.exists("address"))
- {
+
+ std::string address = g_settings->get("address");
+ if (commanded_world != "")
+ address = "";
+ else if (cmd_args.exists("address"))
address = cmd_args.get("address");
- }
- else
- {
- address = g_settings->get("address");
- }
-
+
std::string playername = g_settings->get("name");
+ if (cmd_args.exists("name"))
+ playername = cmd_args.get("name");
+
+ bool skip_main_menu = cmd_args.getFlag("go");
/*
Device initialization
*/
// Resolution selection
-
- bool fullscreen = false;
+
+ bool fullscreen = g_settings->getBool("fullscreen");
u16 screenW = g_settings->getU16("screenW");
u16 screenH = g_settings->getU16("screenH");
+ // bpp, fsaa, vsync
+
+ bool vsync = g_settings->getBool("vsync");
+ u16 bits = g_settings->getU16("fullscreen_bpp");
+ u16 fsaa = g_settings->getU16("fsaa");
+
// Determine driver
+ video::E_DRIVER_TYPE driverType = video::EDT_OPENGL;
+ static const char* driverids[] = {
+ "null",
+ "software",
+ "burningsvideo",
+ "direct3d8",
+ "direct3d9",
+ "opengl"
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+ ,"ogles1"
+#endif
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+ ,"ogles2"
+#endif
+ ,"invalid"
+ };
- video::E_DRIVER_TYPE driverType;
-
std::string driverstring = g_settings->get("video_driver");
-
- if(driverstring == "null")
- driverType = video::EDT_NULL;
- else if(driverstring == "software")
- driverType = video::EDT_SOFTWARE;
- else if(driverstring == "burningsvideo")
- driverType = video::EDT_BURNINGSVIDEO;
- else if(driverstring == "direct3d8")
- driverType = video::EDT_DIRECT3D8;
- else if(driverstring == "direct3d9")
- driverType = video::EDT_DIRECT3D9;
- else if(driverstring == "opengl")
- driverType = video::EDT_OPENGL;
- else
+ for (unsigned int i = 0;
+ i < (sizeof(driverids)/sizeof(driverids[0]));
+ i++)
{
- dstream<<"WARNING: Invalid video_driver specified; defaulting "
- "to opengl"<<std::endl;
- driverType = video::EDT_OPENGL;
+ if (strcasecmp(driverstring.c_str(), driverids[i]) == 0) {
+ driverType = (video::E_DRIVER_TYPE) i;
+ break;
+ }
+
+ if (strcasecmp("invalid", driverids[i]) == 0) {
+ errorstream << "WARNING: Invalid video_driver specified; defaulting "
+ << "to opengl" << std::endl;
+ break;
+ }
}
/*
- Create device and exit if creation failed
+ List video modes if requested
*/
+ MyEventReceiver* receiver = new MyEventReceiver();
+
+ if (cmd_args.getFlag("videomodes")) {
+ IrrlichtDevice *nulldevice;
+
+ SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
+ params.DriverType = video::EDT_NULL;
+ params.WindowSize = core::dimension2d<u32>(640, 480);
+ params.Bits = 24;
+ params.AntiAlias = fsaa;
+ params.Fullscreen = false;
+ params.Stencilbuffer = false;
+ params.Vsync = vsync;
+ params.EventReceiver = receiver;
+ params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
+
+ nulldevice = createDeviceEx(params);
+
+ if (nulldevice == 0)
+ return 1;
+
+ dstream << _("Available video modes (WxHxD):") << std::endl;
- MyEventReceiver receiver;
+ video::IVideoModeList *videomode_list =
+ nulldevice->getVideoModeList();
- IrrlichtDevice *device;
- device = createDevice(driverType,
- core::dimension2d<u32>(screenW, screenH),
- 16, fullscreen, false, false, &receiver);
+ if (videomode_list == 0) {
+ nulldevice->drop();
+ return 1;
+ }
+
+ s32 videomode_count = videomode_list->getVideoModeCount();
+ core::dimension2d<u32> videomode_res;
+ s32 videomode_depth;
+ for (s32 i = 0; i < videomode_count; ++i) {
+ videomode_res = videomode_list->getVideoModeResolution(i);
+ videomode_depth = videomode_list->getVideoModeDepth(i);
+ dstream<<videomode_res.Width << "x" << videomode_res.Height
+ << "x" << videomode_depth << std::endl;
+ }
- if (device == 0)
+ dstream << _("Active video mode (WxHxD):") << std::endl;
+ videomode_res = videomode_list->getDesktopResolution();
+ videomode_depth = videomode_list->getDesktopDepth();
+ dstream << videomode_res.Width << "x" << videomode_res.Height
+ << "x" << videomode_depth << std::endl;
+
+ nulldevice->drop();
+
+ delete receiver;
+ return 0;
+ }
+
+ /*
+ Create device and exit if creation failed
+ */
+ SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
+ params.DriverType = driverType;
+ params.WindowSize = core::dimension2d<u32>(screenW, screenH);
+ params.Bits = bits;
+ params.AntiAlias = fsaa;
+ params.Fullscreen = fullscreen;
+ params.Stencilbuffer = false;
+ params.Vsync = vsync;
+ params.EventReceiver = receiver;
+ params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
+#ifdef __ANDROID__
+ params.PrivateData = porting::app_global;
+ params.OGLES2ShaderPath = std::string(porting::path_user + DIR_DELIM +
+ "media" + DIR_DELIM + "Shaders" + DIR_DELIM).c_str();
+#endif
+
+ IrrlichtDevice * device = createDeviceEx(params);
+
+ if (device == 0) {
+ delete receiver;
return 1; // could not create selected driver.
-
- // Set the window caption
- device->setWindowCaption(L"Minetest [Main Menu]");
-
+ }
+
+ // Map our log level to irrlicht engine one.
+ static const irr::ELOG_LEVEL irr_log_level[5] = {
+ ELL_NONE,
+ ELL_ERROR,
+ ELL_WARNING,
+ ELL_INFORMATION,
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
+ ELL_INFORMATION
+#else
+ ELL_DEBUG
+#endif
+ };
+
+ ILogger* irr_logger = device->getLogger();
+ irr_logger->setLogLevel(irr_log_level[loglevel]);
+
+ porting::initIrrlicht(device);
+ late_init_default_settings(g_settings);
+
+ /*
+ Continue initialization
+ */
+
+ video::IVideoDriver* driver = device->getVideoDriver();
+
+ /*
+ This changes the minimum allowed number of vertices in a VBO.
+ Default is 500.
+ */
+ //driver->setMinHardwareBufferVertexCount(50);
+
// Create time getter
g_timegetter = new IrrlichtTimeGetter(device);
-
+
// Create game callback for menus
g_gamecallback = new MainGameCallback(device);
-
- // Create texture source
- g_texturesource = new TextureSource(device);
/*
Speed tests (done after irrlicht is loaded to get timer)
*/
- if(cmd_args.getFlag("speedtests"))
+ if (cmd_args.getFlag("speedtests"))
{
- dstream<<"Running speed tests"<<std::endl;
+ dstream << "Running speed tests" << std::endl;
SpeedTests();
+ device->drop();
return 0;
}
-
+
device->setResizable(true);
bool random_input = g_settings->getBool("random_input")
|| cmd_args.getFlag("random-input");
InputHandler *input = NULL;
- if(random_input)
- input = new RandomInputHandler();
- else
- input = new RealInputHandler(device, &receiver);
-
- /*
- Continue initialization
- */
-
- //video::IVideoDriver* driver = device->getVideoDriver();
- /*
- This changes the minimum allowed number of vertices in a VBO.
- Default is 500.
- */
- //driver->setMinHardwareBufferVertexCount(50);
+ if (random_input) {
+ input = new RandomInputHandler();
+ } else {
+ input = new RealInputHandler(device,receiver);
+ }
scene::ISceneManager* smgr = device->getSceneManager();
guienv = device->getGUIEnvironment();
gui::IGUISkin* skin = guienv->getSkin();
- gui::IGUIFont* font = guienv->getFont(getTexturePath("fontlucida.png").c_str());
- if(font)
+ std::string font_path = g_settings->get("font_path");
+ gui::IGUIFont *font;
+ #if USE_FREETYPE
+ bool use_freetype = g_settings->getBool("freetype");
+ if (use_freetype) {
+ std::string fallback;
+ if (is_yes(gettext("needs_fallback_font")))
+ fallback = "fallback_";
+ u16 font_size = g_settings->getU16(fallback + "font_size");
+ font_path = g_settings->get(fallback + "font_path");
+ u32 font_shadow = g_settings->getU16(fallback + "font_shadow");
+ u32 font_shadow_alpha = g_settings->getU16(fallback + "font_shadow_alpha");
+ font = gui::CGUITTFont::createTTFont(guienv, font_path.c_str(), font_size,
+ true, true, font_shadow, font_shadow_alpha);
+ } else {
+ font = guienv->getFont(font_path.c_str());
+ }
+ #else
+ font = guienv->getFont(font_path.c_str());
+ #endif
+ if (font)
skin->setFont(font);
else
- dstream<<"WARNING: Font file was not found."
- " Using default font."<<std::endl;
+ errorstream << "WARNING: Font file was not found."
+ << " Using default font." << std::endl;
// If font was not found, this will get us one
font = skin->getFont();
assert(font);
-
+
u32 text_height = font->getDimension(L"Hello, world!").Height;
- dstream<<"text_height="<<text_height<<std::endl;
-
- //skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255,0,0,0));
- skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255,255,255,255));
- //skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(0,0,0,0));
- //skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(0,0,0,0));
- skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255,0,0,0));
- skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255,0,0,0));
-
- /*
- Preload some textures and stuff
- */
+ infostream << "text_height=" << text_height << std::endl;
+
+ skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255, 255, 255, 255));
+ skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255, 0, 0, 0));
+ skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255, 0, 0, 0));
+ skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 70, 100, 50));
+ skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255, 255, 255, 255));
+
+#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
+ // Irrlicht 1.8 input colours
+ skin->setColor(gui::EGDC_EDITABLE, video::SColor(255, 128, 128, 128));
+ skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 96, 134, 49));
+#endif
+
- init_mapnode(); // Second call with g_texturesource set
- init_mineral();
+ // Create the menu clouds
+ if (!g_menucloudsmgr)
+ g_menucloudsmgr = smgr->createNewSceneManager();
+ if (!g_menuclouds)
+ g_menuclouds = new Clouds(g_menucloudsmgr->getRootSceneNode(),
+ g_menucloudsmgr, -1, rand(), 100);
+ g_menuclouds->update(v2f(0, 0), video::SColor(255, 200, 200, 255));
+ scene::ICameraSceneNode* camera;
+ camera = g_menucloudsmgr->addCameraSceneNode(0,
+ v3f(0, 0, 0), v3f(0, 60, 100));
+ camera->setFarValue(10000);
/*
GUI stuff
*/
+ ChatBackend chat_backend;
+
/*
If an error occurs, this is set to something and the
menu-game loop is restarted. It is then displayed before
// The password entered during the menu screen,
std::string password;
+ bool first_loop = true;
+
/*
Menu-game loop
*/
- while(device->run() && kill == false)
+ while (device->run() && (kill == false) &&
+ (g_gamecallback->shutdown_requested == false))
{
+ // Set the window caption
+ wchar_t* text = wgettext("Main Menu");
+ device->setWindowCaption((std::wstring(L"Minetest [") + text + L"]").c_str());
+ delete[] text;
// This is used for catching disconnects
try
Clear everything from the GUIEnvironment
*/
guienv->clear();
-
+
/*
We need some kind of a root node to be able to add
custom gui elements directly on the screen.
Otherwise they won't be automatically drawn.
*/
guiroot = guienv->addStaticText(L"",
- core::rect<s32>(0, 0, 10000, 10000));
-
+ core::rect<s32>(0, 0, 10000, 10000));
+
+ SubgameSpec gamespec;
+ WorldSpec worldspec;
+ bool simple_singleplayer_mode = false;
+
+ // These are set up based on the menu and other things
+ std::string current_playername = "inv£lid";
+ std::string current_password = "";
+ std::string current_address = "does-not-exist";
+ int current_port = 0;
+
/*
Out-of-game menu loop.
Loop quits when menu returns proper parameters.
*/
- while(kill == false)
- {
+ while (kill == false) {
+ // If skip_main_menu, only go through here once
+ if (skip_main_menu && !first_loop) {
+ kill = true;
+ break;
+ }
+ first_loop = false;
+
// Cursor can be non-visible when coming from the game
+ #ifndef ANDROID
device->getCursorControl()->setVisible(true);
+ #endif
// Some stuff are left to scene manager when coming from the game
// (map at least?)
smgr->clear();
- // Reset or hide the debug gui texts
- /*guitext->setText(L"Minetest-c55");
- guitext2->setVisible(false);
- guitext_info->setVisible(false);
- guitext_chat->setVisible(false);*/
-
+
// Initialize menu data
MainMenuData menudata;
- menudata.address = narrow_to_wide(address);
- menudata.name = narrow_to_wide(playername);
- menudata.port = narrow_to_wide(itos(port));
- menudata.fancy_trees = g_settings->getBool("new_style_leaves");
- menudata.smooth_lighting = g_settings->getBool("smooth_lighting");
- menudata.creative_mode = g_settings->getBool("creative_mode");
- menudata.enable_damage = g_settings->getBool("enable_damage");
-
- GUIMainMenu *menu =
- new GUIMainMenu(guienv, guiroot, -1,
- &g_menumgr, &menudata, g_gamecallback);
- menu->allowFocusRemoval(true);
-
- if(error_message != L"")
- {
- dstream<<"WARNING: error_message = "
- <<wide_to_narrow(error_message)<<std::endl;
-
- GUIMessageMenu *menu2 =
- new GUIMessageMenu(guienv, guiroot, -1,
- &g_menumgr, error_message.c_str());
- menu2->drop();
- error_message = L"";
+ menudata.address = address;
+ menudata.name = playername;
+ menudata.port = itos(port);
+ menudata.errormessage = wide_to_narrow(error_message);
+ error_message = L"";
+ if (cmd_args.exists("password"))
+ menudata.password = cmd_args.get("password");
+
+ driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
+
+ menudata.enable_public = g_settings->getBool("server_announce");
+
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+
+ // If a world was commanded, append and select it
+ if(commanded_world != "") {
+ worldspec.gameid = getWorldGameId(commanded_world, true);
+ worldspec.name = _("[--world parameter]");
+ if(worldspec.gameid == "") {
+ worldspec.gameid = g_settings->get("default_game");
+ worldspec.name += " [new]";
+ }
+ worldspec.path = commanded_world;
}
- video::IVideoDriver* driver = device->getVideoDriver();
-
- dstream<<"Created main menu"<<std::endl;
+ if (skip_main_menu == false) {
+ video::IVideoDriver* driver = device->getVideoDriver();
+
+ infostream << "Waiting for other menus" << std::endl;
+ while (device->run() && kill == false) {
+ if (noMenuActive())
+ break;
+ driver->beginScene(true, true,
+ video::SColor(255, 128, 128, 128));
+ guienv->drawAll();
+ driver->endScene();
+ // On some computers framerate doesn't seem to be
+ // automatically limited
+ sleep_ms(25);
+ }
+ infostream << "Waited for other menus" << std::endl;
+
+ /* show main menu */
+ GUIEngine mymenu(device, guiroot, &g_menumgr,smgr,&menudata,kill);
+
+ //once finished you'll never end up here
+ smgr->clear();
+ }
- while(device->run() && kill == false)
- {
- if(menu->getStatus() == true)
- break;
+ if (menudata.errormessage != "") {
+ error_message = narrow_to_wide(menudata.errormessage);
+ continue;
+ }
- //driver->beginScene(true, true, video::SColor(255,0,0,0));
- driver->beginScene(true, true, video::SColor(255,128,128,128));
+ //update worldspecs (necessary as new world may have been created)
+ worldspecs = getAvailableWorlds();
- drawMenuBackground(driver);
+ if (menudata.name == "")
+ menudata.name = std::string("Guest") + itos(myrand_range(1000,9999));
+ else
+ playername = menudata.name;
+
+ password = translatePassword(playername, narrow_to_wide(menudata.password));
+ //infostream<<"Main: password hash: '"<<password<<"'"<<std::endl;
+
+ address = menudata.address;
+ int newport = stoi(menudata.port);
+ if (newport != 0)
+ port = newport;
+
+ simple_singleplayer_mode = menudata.simple_singleplayer_mode;
+
+ // Save settings
+ g_settings->set("name", playername);
- guienv->drawAll();
-
- driver->endScene();
-
- // On some computers framerate doesn't seem to be
- // automatically limited
- sleep_ms(25);
- }
-
// Break out of menu-game loop to shut down cleanly
- if(device->run() == false || kill == true)
+ if (device->run() == false || kill == true)
break;
-
- dstream<<"Dropping main menu"<<std::endl;
-
- menu->drop();
-
- // Delete map if requested
- if(menudata.delete_map)
- {
- bool r = fs::RecursiveDeleteContent(map_dir);
- if(r == false)
- error_message = L"Delete failed";
- continue;
- }
- playername = wide_to_narrow(menudata.name);
+ current_playername = playername;
+ current_password = password;
+ current_address = address;
+ current_port = port;
+
+ // If using simple singleplayer mode, override
+ if (simple_singleplayer_mode) {
+ current_playername = "singleplayer";
+ current_password = "";
+ current_address = "";
+ current_port = myrand_range(49152, 65535);
+ } else if (address != "") {
+ ServerListSpec server;
+ server["name"] = menudata.servername;
+ server["address"] = menudata.address;
+ server["port"] = menudata.port;
+ server["description"] = menudata.serverdescription;
+ ServerList::insert(server);
+ }
- password = translatePassword(playername, menudata.password);
+ if ((!skip_main_menu) &&
+ (menudata.selected_world >= 0) &&
+ (menudata.selected_world < (int)worldspecs.size())) {
+ g_settings->set("selected_world_path",
+ worldspecs[menudata.selected_world].path);
+ worldspec = worldspecs[menudata.selected_world];
- //dstream<<"Main: password hash: '"<<password<<"'"<<std::endl;
+ }
- address = wide_to_narrow(menudata.address);
- int newport = stoi(wide_to_narrow(menudata.port));
- if(newport != 0)
- port = newport;
- g_settings->set("new_style_leaves", itos(menudata.fancy_trees));
- g_settings->set("smooth_lighting", itos(menudata.smooth_lighting));
- g_settings->set("creative_mode", itos(menudata.creative_mode));
- g_settings->set("enable_damage", itos(menudata.enable_damage));
-
- // NOTE: These are now checked server side; no need to do it
- // here, so let's not do it here.
- /*// Check for valid parameters, restart menu if invalid.
- if(playername == "")
- {
- error_message = L"Name required.";
- continue;
+ infostream <<"Selected world: " << worldspec.name
+ << " ["<<worldspec.path<<"]" <<std::endl;
+
+
+ // If local game
+ if (current_address == "") {
+ if (worldspec.path == "") {
+ error_message = wgettext("No world selected and no address "
+ "provided. Nothing to do.");
+ errorstream << wide_to_narrow(error_message) << std::endl;
+ continue;
+ }
+
+ if (!fs::PathExists(worldspec.path)) {
+ error_message = wgettext("Provided world path doesn't exist: ")
+ + narrow_to_wide(worldspec.path);
+ errorstream << wide_to_narrow(error_message) << std::endl;
+ continue;
+ }
+
+ // Load gamespec for required game
+ gamespec = findWorldSubgame(worldspec.path);
+ if (!gamespec.isValid() && !commanded_gamespec.isValid()) {
+ error_message = wgettext("Could not find or load game \"")
+ + narrow_to_wide(worldspec.gameid) + L"\"";
+ errorstream << wide_to_narrow(error_message) << std::endl;
+ continue;
+ }
+ if (commanded_gamespec.isValid() &&
+ commanded_gamespec.id != worldspec.gameid) {
+ errorstream<<"WARNING: Overriding gamespec from \""
+ << worldspec.gameid << "\" to \""
+ << commanded_gamespec.id << "\"" << std::endl;
+ gamespec = commanded_gamespec;
+ }
+
+ if (!gamespec.isValid()) {
+ error_message = wgettext("Invalid gamespec.");
+ error_message += L" (world_gameid="
+ + narrow_to_wide(worldspec.gameid) + L")";
+ errorstream << wide_to_narrow(error_message) << std::endl;
+ continue;
+ }
}
- // Check that name has only valid chars
- if(string_allowed(playername, PLAYERNAME_ALLOWED_CHARS)==false)
- {
- error_message = L"Characters allowed: "
- +narrow_to_wide(PLAYERNAME_ALLOWED_CHARS);
- continue;
- }*/
- // Save settings
- g_settings->set("name", playername);
- g_settings->set("address", address);
- g_settings->set("port", itos(port));
- // Update configuration file
- if(configpath != "")
- g_settings->updateConfigFile(configpath.c_str());
-
// Continue to game
break;
}
-
+
// Break out of menu-game loop to shut down cleanly
- if(device->run() == false)
+ if (device->run() == false || kill == true) {
+ if (g_settings_path != "") {
+ g_settings->updateConfigFile(g_settings_path.c_str());
+ }
break;
-
- // Initialize mapnode again to enable changed graphics settings
- init_mapnode();
+ }
+
+ if (current_playername.length() > PLAYERNAME_SIZE-1) {
+ error_message = wgettext("Player name too long.");
+ playername = current_playername.substr(0,PLAYERNAME_SIZE-1);
+ g_settings->set("name", playername);
+ continue;
+ }
/*
Run game
*/
+#ifdef HAVE_TOUCHSCREENGUI
+ receiver->m_touchscreengui = new TouchScreenGUI(device, receiver);
+ g_touchscreengui = receiver->m_touchscreengui;
+#endif
the_game(
kill,
random_input,
input,
device,
font,
- map_dir,
- playername,
- password,
- address,
- port,
+ worldspec.path,
+ current_playername,
+ current_password,
+ current_address,
+ current_port,
error_message,
- configpath
+ chat_backend,
+ gamespec,
+ simple_singleplayer_mode
);
+ smgr->clear();
+#ifdef HAVE_TOUCHSCREENGUI
+ delete g_touchscreengui;
+ g_touchscreengui = NULL;
+ receiver->m_touchscreengui = NULL;
+#endif
} //try
catch(con::PeerNotFoundException &e)
{
- dstream<<DTIME<<"Connection error (timed out?)"<<std::endl;
- error_message = L"Connection error (timed out?)";
- }
- catch(SocketException &e)
- {
- dstream<<DTIME<<"Socket error (port already in use?)"<<std::endl;
- error_message = L"Socket error (port already in use?)";
+ error_message = wgettext("Connection error (timed out?)");
+ errorstream << wide_to_narrow(error_message) << std::endl;
}
#ifdef NDEBUG
catch(std::exception &e)
{
- std::string narrow_message = "Some exception, what()=\"";
+ std::string narrow_message = "Some exception: \"";
narrow_message += e.what();
narrow_message += "\"";
- dstream<<DTIME<<narrow_message<<std::endl;
+ errorstream << narrow_message << std::endl;
error_message = narrow_to_wide(narrow_message);
}
#endif
+ // If no main menu, show error and exit
+ if (skip_main_menu) {
+ if (error_message != L"") {
+ verbosestream << "error_message = "
+ << wide_to_narrow(error_message) << std::endl;
+ retval = 1;
+ }
+ break;
+ }
} // Menu-game loop
-
+
+
+ g_menuclouds->drop();
+ g_menucloudsmgr->drop();
+
delete input;
/*
In the end, delete the Irrlicht device.
*/
device->drop();
-
- END_DEBUG_EXCEPTION_HANDLER
-
+
+#if USE_FREETYPE
+ if (use_freetype)
+ font->drop();
+#endif
+ delete receiver;
+#endif // !SERVER
+
+ // Update configuration file
+ if (g_settings_path != "")
+ g_settings->updateConfigFile(g_settings_path.c_str());
+
+ // Print modified quicktune values
+ {
+ bool header_printed = false;
+ std::vector<std::string> names = getQuicktuneNames();
+ for(u32 i = 0; i < names.size(); i++) {
+ QuicktuneValue val = getQuicktuneValue(names[i]);
+ if (!val.modified)
+ continue;
+ if (!header_printed) {
+ dstream << "Modified quicktune values:" << std::endl;
+ header_printed = true;
+ }
+ dstream<<names[i] << " = " << val.getString() << std::endl;
+ }
+ }
+
+ // Stop httpfetch thread (if started)
+ httpfetch_cleanup();
+
+ END_DEBUG_EXCEPTION_HANDLER(errorstream)
+
debugstreams_deinit();
-
- return 0;
+
+
+ return retval;
}
//END
-