diff options
| author | PilzAdam <pilzadam@minetest.net> | 2013-07-28 23:14:42 +0200 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-07-28 23:29:03 +0200 |
| commit | 4fb4efd8ed54a81ea545e51265f2acdd01654f21 (patch) | |
| tree | 4f47e2a94931500675ca11f6b008d4186f4c1b61 /src/main.cpp | |
| parent | 174285f29878c7171c84848ae9282a9efa546bd6 (diff) | |
| download | minetest-4fb4efd8ed54a81ea545e51265f2acdd01654f21.tar.gz minetest-4fb4efd8ed54a81ea545e51265f2acdd01654f21.tar.bz2 minetest-4fb4efd8ed54a81ea545e51265f2acdd01654f21.zip | |
Play sounds/main_menu.ogg in menu
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8ed164d1f..716da57c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,8 +76,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "subgame.h" #include "quicktune.h" #include "serverlist.h" -#include "sound.h" -#include "sound_openal.h" #include "guiEngine.h" /* @@ -205,49 +203,6 @@ u32 getTime(TimePrecision prec) { } #endif -//Client side main menu music fetcher -#ifndef SERVER -class MenuMusicFetcher: public OnDemandSoundFetcher -{ - std::set<std::string> m_fetched; -public: - - void fetchSounds(const std::string &name, - std::set<std::string> &dst_paths, - std::set<std::string> &dst_datas) - { - if(m_fetched.count(name)) - return; - m_fetched.insert(name); - std::string base; - base = porting::path_share + DIR_DELIM + "sounds"; - dst_paths.insert(base + DIR_DELIM + name + ".ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".0.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".1.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".2.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".3.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".4.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".5.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".6.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".7.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".8.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".9.ogg"); - base = porting::path_user + DIR_DELIM + "sounds"; - dst_paths.insert(base + DIR_DELIM + name + ".ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".0.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".1.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".2.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".3.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".4.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".5.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".6.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".7.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".8.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".9.ogg"); - } -}; -#endif - class StderrLogOutput: public ILogOutput { public: @@ -1711,7 +1666,7 @@ int main(int argc, char *argv[]) // Continue to game break; } - + // Break out of menu-game loop to shut down cleanly if(device->run() == false || kill == true) { g_settings->updateConfigFile(configpath.c_str()); |