diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-07-21 20:55:08 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-21 20:55:08 +0300 |
commit | 308d8613276ef695d587e72773f0b96253cdb328 (patch) | |
tree | dfa275376e8e1e60d9f681c2668ae619fadf8876 /src | |
parent | 6505bae4147dbccb70acfeb894a217d0dcc3f048 (diff) | |
parent | 74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c (diff) | |
download | minetest-308d8613276ef695d587e72773f0b96253cdb328.tar.gz minetest-308d8613276ef695d587e72773f0b96253cdb328.tar.bz2 minetest-308d8613276ef695d587e72773f0b96253cdb328.zip |
Merged minetest-delta a624fe549bc75855a170
Diffstat (limited to 'src')
-rw-r--r-- | src/client.cpp | 1 | ||||
-rw-r--r-- | src/main.cpp | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/client.cpp b/src/client.cpp index 4f0baa573..7ebb30fba 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -932,6 +932,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) */ //m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio()); + /* Add it to mesh update queue and set it to be acknowledged after update. */ diff --git a/src/main.cpp b/src/main.cpp index b6a53566e..3edf79bd2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1060,6 +1060,7 @@ int main(int argc, char *argv[]) std::locale::global(std::locale("C"));
// This enables printing all characters in bitmap font
setlocale(LC_CTYPE, "en_US");
+
/*
Parse command line
*/
@@ -1350,9 +1351,9 @@ int main(int argc, char *argv[]) // Set device in game parameters
device = device;
- - // Set the window caption - device->setWindowCaption(L"Minetest [Main Menu]"); +
+ // Set the window caption
+ device->setWindowCaption(L"Minetest [Main Menu]");
// Create time getter
g_timegetter = new IrrlichtTimeGetter(device);
|