Merge pull request #24 from SpeedProg/master

[minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index cd5df666d4c31534994c882a6dcdfd0b2f0ca955..b6a53566e3f92e39fee6418bf810475916d4c049 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -126,6 +126,16 @@ SUGG: Erosion simulation at map generation time
        - Simulate rock falling from cliffs when water has removed\r
          enough solid rock from the bottom\r
 \r
+SUGG: For non-mapgen FarMesh: Add a per-sector database to store surface\r
+      stuff as simple flags/values\r
+      - Light?\r
+         - A building?\r
+         And at some point make the server send this data to the client too,\r
+         instead of referring to the noise functions\r
+         - Ground height\r
+         - Surface ground type\r
+         - Trees?\r
+\r
 Gaming ideas:\r
 -------------\r
 \r
@@ -199,12 +209,13 @@ SUGG: Make fetching sector's blocks more efficient when rendering
       sectors that have very large amounts of blocks (on client)\r
          - Is this necessary at all?\r
 \r
-TODO: Flowing water animation\r
-\r
 SUGG: Draw cubes in inventory directly with 3D drawing commands, so that\r
       animating them is easier.\r
 \r
 SUGG: Option for enabling proper alpha channel for textures\r
+\r
+TODO: Flowing water animation\r
+\r
 TODO: A setting for enabling bilinear filtering for textures\r
 \r
 TODO: Better control of draw_control.wanted_max_blocks\r
@@ -321,15 +332,6 @@ TODO: Think about using same bits for material for fences and doors, for
 TODO: Move mineral to param2, increment map serialization version, add\r
       conversion\r
 \r
-TODO: Add a per-sector database to store surface stuff as simple flags/values\r
-      - Light?\r
-         - A building?\r
-         And at some point make the server send this data to the client too,\r
-         instead of referring to the noise functions\r
-         - Ground height\r
-         - Surface ground type\r
-         - Trees?\r
-\r
 TODO: Restart irrlicht completely when coming back to main menu from game.\r
        - This gets rid of everything that is stored in irrlicht's caches.\r
 \r
@@ -399,6 +401,8 @@ Doing currently:
 #include "keycode.h"\r
 #include "tile.h"\r
 \r
+#include "gettext.h"\r
+\r
 // This makes textures\r
 ITextureSource *g_texturesource = NULL;\r
 \r
@@ -1056,7 +1060,6 @@ int main(int argc, char *argv[])
        std::locale::global(std::locale("C"));\r
        // This enables printing all characters in bitmap font\r
        setlocale(LC_CTYPE, "en_US");\r
-\r
        /*\r
                Parse command line\r
        */\r
@@ -1128,6 +1131,10 @@ int main(int argc, char *argv[])
 \r
        // Create user data directory\r
        fs::CreateDir(porting::path_userdata);\r
+\r
+       setlocale(LC_ALL, "");\r
+       bindtextdomain("minetest-c55", (porting::path_userdata+"/locale").c_str());\r
+       textdomain("minetest-c55");\r
        \r
        // Initialize debug streams\r
 #ifdef RUN_IN_PLACE\r
@@ -1343,6 +1350,9 @@ int main(int argc, char *argv[])
        \r
        // Set device in game parameters\r
        device = device;\r
+
+       // Set the window caption
+       device->setWindowCaption(L"Minetest [Main Menu]");
        \r
        // Create time getter\r
        g_timegetter = new IrrlichtTimeGetter(device);\r