diff options
| author | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
| commit | 1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124 (patch) | |
| tree | 54660f353f3342f89b6259ea6a5dfedfa20dc16f /src/main.cpp | |
| parent | ec039a3d123120f9918812b13f5971e94546b9af (diff) | |
| parent | 64627817fcca52f20948c24b60ce192b218f6ce2 (diff) | |
| download | hax-minetest-server-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.gz hax-minetest-server-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7f9ec1ace..eda992793 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1845,7 +1845,9 @@ int main(int argc, char *argv[]) MenuMusicFetcher soundfetcher; ISoundManager *sound = NULL; +#if USE_SOUND sound = createOpenALSoundManager(&soundfetcher); +#endif if(!sound) sound = &dummySoundManager; SimpleSoundSpec spec; @@ -1940,6 +1942,9 @@ int main(int argc, char *argv[]) sound = NULL; } + // Save controls status + menu->readInput(&menudata); + infostream<<"Dropping main menu"<<std::endl; menu->drop(); @@ -2145,7 +2150,9 @@ int main(int argc, char *argv[]) */ device->drop(); - delete font; +#if USE_FREETYPE + font->drop(); +#endif #endif // !SERVER |