diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:46:55 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:47:55 +0200 |
| commit | 96bee29e35f0790657fbd8bb67d2af79b498255c (patch) | |
| tree | 0712c75629ab16fad84af11050ef94d8c8ac8137 /src/game.cpp | |
| parent | 82ea53499710c9a4e92ec595d8c14c417bdd0ee6 (diff) | |
| parent | f2051c98223d087c8ba3d7e4514935781c93ed1c (diff) | |
| download | minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.gz minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.bz2 minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.zip | |
Merge branch 'upstream/master'
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp index b3069d6f9..6c0474ee7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -715,7 +715,8 @@ void the_game( std::string password, std::string address, u16 port, - std::wstring &error_message + std::wstring &error_message, + std::string configpath ) { video::IVideoDriver* driver = device->getVideoDriver(); @@ -755,7 +756,7 @@ void the_game( if(address == ""){ draw_load_screen(L"Creating server...", driver, font); std::cout<<DTIME<<"Creating server"<<std::endl; - server = new Server(map_dir); + server = new Server(map_dir, configpath); server->start(port); } @@ -1656,6 +1657,8 @@ void the_game( else if(input->getRightClicked()) { std::cout<<DTIME<<"Right-clicked object"<<std::endl; + client.clickActiveObject(1, + selected_active_object->getId(), g_selected_item); } } else // selected_object == NULL @@ -2021,7 +2024,7 @@ void the_game( endscenetime_avg = endscenetime_avg * 0.95 + (float)endscenetime*0.05; char temptext[300]; - snprintf(temptext, 300, "Minetest-delta %s (" + snprintf(temptext, 300, "Minetest-c55 %s (" "R: range_all=%i" ")" " drawtime=%.0f, beginscenetime=%.0f" |