Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- removed directsound8 as a selectable option in ini or UI

Browse Source
This commit is contained in:
Mark Vejvoda 2012-08-01 00:51:27 +00:00
parent 19937c7512
commit 19db401c83
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/glest_game/menu/menu_state_options.cpp
View File

@ -75,9 +75,10 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
listBoxSoundFactory.init(currentColumnStart, currentLine, 100); listBoxSoundFactory.init(currentColumnStart, currentLine, 100);
listBoxSoundFactory.pushBackItem("None"); listBoxSoundFactory.pushBackItem("None");
listBoxSoundFactory.pushBackItem("OpenAL"); listBoxSoundFactory.pushBackItem("OpenAL");
#ifdef WIN32 // deprecated as of 3.6.1
listBoxSoundFactory.pushBackItem("DirectSound8"); //#ifdef WIN32
#endif //listBoxSoundFactory.pushBackItem("DirectSound8");
//#endif
listBoxSoundFactory.setSelectedItem(config.getString("FactorySound")); listBoxSoundFactory.setSelectedItem(config.getString("FactorySound"));
currentLine-=lineOffset; currentLine-=lineOffset;
@ -600,9 +601,10 @@ void MenuStateOptions::reloadUI() {
std::vector<string> listboxData; std::vector<string> listboxData;
listboxData.push_back("None"); listboxData.push_back("None");
listboxData.push_back("OpenAL"); listboxData.push_back("OpenAL");
#ifdef WIN32 // deprecated as of 3.6.1
listboxData.push_back("DirectSound8"); //#ifdef WIN32
#endif // listboxData.push_back("DirectSound8");
//#endif
listBoxSoundFactory.setItems(listboxData); listBoxSoundFactory.setItems(listboxData);

1
source/shared_lib/include/map/map_preview.h
View File

@ -17,6 +17,7 @@
#include "randomgen.h" #include "randomgen.h"
#include "vec.h" #include "vec.h"
#include <vector> #include <vector>
#include <string>
using Shared::Platform::int8; using Shared::Platform::int8;
using Shared::Platform::int32; using Shared::Platform::int32;

13
source/shared_lib/sources/platform/win32/factory_repository.cpp
View File

@ -32,21 +32,22 @@ GraphicsFactory *FactoryRepository::getGraphicsFactory(const string &name){
return &graphicsFactoryGl2; return &graphicsFactoryGl2;
} }
throw megaglest_runtime_error("Unknown graphics factory: " + name); throw megaglest_runtime_error("Unknown graphics factory: [" + name + "]");
} }
SoundFactory *FactoryRepository::getSoundFactory(const string &name){ SoundFactory *FactoryRepository::getSoundFactory(const string &name){
if(name == "DirectSound8"){ // deprecated as of 3.6.1
return &soundFactoryDs8; //if(name == "DirectSound8"){
} // return &soundFactoryDs8;
else if(name == "OpenAL") { //}
if(name == "OpenAL") {
return &soundFactoryOpenAL; return &soundFactoryOpenAL;
} }
else if(name == "" || name == "None") { else if(name == "" || name == "None") {
return &soundFactoryNone; return &soundFactoryNone;
} }
throw megaglest_runtime_error("Unknown sound factory: " + name); throw megaglest_runtime_error("Unknown sound factory: [" + name + "]");
} }
}}//end namespace }}//end namespace