diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/guiMainMenu.h | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/guiMainMenu.h')
| -rw-r--r-- | src/guiMainMenu.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h index a21f3b32a..a594ccd41 100644 --- a/src/guiMainMenu.h +++ b/src/guiMainMenu.h @@ -29,6 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc., class IGameCallback; +enum { + SERVERLIST_FAVORITES, + SERVERLIST_PUBLIC, +}; + struct MainMenuData { // These are in the native format of the gui elements @@ -52,6 +57,7 @@ struct MainMenuData int enable_shaders; bool preload_item_visuals; bool enable_particles; + bool liquid_finite; // Server options bool creative_mode; bool enable_damage; @@ -63,7 +69,7 @@ struct MainMenuData std::string create_world_gameid; bool only_refresh; - bool serverlist_show_available; // if false show local favorites only + int selected_serverlist; std::vector<WorldSpec> worlds; std::vector<SubgameSpec> games; @@ -84,7 +90,7 @@ struct MainMenuData // Actions only_refresh(false), - serverlist_show_available(false) + selected_serverlist(SERVERLIST_FAVORITES) {} }; |