diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 11:50:29 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 11:51:33 +0300 |
| commit | f801e16b787f033cea4e473d69b54fe65248a439 (patch) | |
| tree | 25cd83a122fd4a1cb74d605aecaa65caa1b5f8a7 /src/game.cpp | |
| parent | 4bf5065a9cdaf55a6915e647e9b5de5281d6622f (diff) | |
| download | minetest-f801e16b787f033cea4e473d69b54fe65248a439.tar.gz minetest-f801e16b787f033cea4e473d69b54fe65248a439.tar.bz2 minetest-f801e16b787f033cea4e473d69b54fe65248a439.zip | |
Texture cache -> Media cache WIP
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/game.cpp b/src/game.cpp index 1dcda043e..eeb5d02e4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -56,7 +56,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "clientmap.h" #include "sky.h" #include "sound.h" -#if USE_AUDIO +#if USE_SOUND #include "sound_openal.h" #endif #include "event_manager.h" @@ -953,7 +953,7 @@ void the_game( // Sound manager ISoundManager *sound = NULL; bool sound_is_dummy = false; -#if USE_AUDIO +#if USE_SOUND infostream<<"Attempting to use OpenAL audio"<<std::endl; sound = createOpenALSoundManager(&soundfetcher); if(!sound) @@ -1163,9 +1163,8 @@ void the_game( ss<<L" Item definitions\n"; ss<<(client.nodedefReceived()?L"[X]":L"[ ]"); ss<<L" Node definitions\n"; - //ss<<(client.texturesReceived()?L"[X]":L"[ ]"); - ss<<L"["<<(int)(client.textureReceiveProgress()*100+0.5)<<L"%] "; - ss<<L" Textures\n"; + ss<<L"["<<(int)(client.mediaReceiveProgress()*100+0.5)<<L"%] "; + ss<<L" Media\n"; draw_load_screen(ss.str(), driver, font); |