projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea1fdf3
)
Handle certain errors properly when using --go
author
Perttu Ahola
<celeron55@gmail.com>
Sun, 11 Mar 2012 19:41:32 +0000
(21:41 +0200)
committer
Perttu Ahola
<celeron55@gmail.com>
Sun, 11 Mar 2012 19:41:32 +0000
(21:41 +0200)
src/main.cpp
patch
|
blob
|
history
diff --git
a/src/main.cpp
b/src/main.cpp
index 5e46018c3793e936317ad20b9c731de6ee34fb74..0d1961fff1de7fc5d3daf4b2de217558729d724b 100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-1207,6
+1207,8
@@
int main(int argc, char *argv[])
// The password entered during the menu screen,
std::string password;
// The password entered during the menu screen,
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
device->getCursorControl()->setVisible(true);
// Some stuff are left to scene manager when coming from the game
// (map at least?)
smgr->clear();
// Cursor can be non-visible when coming from the game
device->getCursorControl()->setVisible(true);
// 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;
// Initialize menu data
MainMenuData menudata;