Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-05 07:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle certain errors properly when using --go

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-11 21:41:32 +02:00
parent ea1fdf3201
commit 5a8ee4889d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@ -1207,6 +1207,8 @@ int main(int argc, char *argv[])
// The password entered during the menu screen, // The password entered during the menu screen,
std::string password; std::string password;
bool first_loop = true;
/* /*
Menu-game loop Menu-game loop
*/ */
@ -1242,16 +1244,18 @@ int main(int argc, char *argv[])
*/ */
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 // Cursor can be non-visible when coming from the game
device->getCursorControl()->setVisible(true); device->getCursorControl()->setVisible(true);
// Some stuff are left to scene manager when coming from the game // Some stuff are left to scene manager when coming from the game
// (map at least?) // (map at least?)
smgr->clear(); 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 // Initialize menu data
MainMenuData menudata; MainMenuData menudata;