diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 2e07b878..29985417 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -75,9 +75,10 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu): listBoxSoundFactory.init(currentColumnStart, currentLine, 100); listBoxSoundFactory.pushBackItem("None"); listBoxSoundFactory.pushBackItem("OpenAL"); - #ifdef WIN32 - listBoxSoundFactory.pushBackItem("DirectSound8"); - #endif + // deprecated as of 3.6.1 + //#ifdef WIN32 + //listBoxSoundFactory.pushBackItem("DirectSound8"); + //#endif listBoxSoundFactory.setSelectedItem(config.getString("FactorySound")); currentLine-=lineOffset; @@ -600,9 +601,10 @@ void MenuStateOptions::reloadUI() { std::vector listboxData; listboxData.push_back("None"); listboxData.push_back("OpenAL"); -#ifdef WIN32 - listboxData.push_back("DirectSound8"); -#endif +// deprecated as of 3.6.1 +//#ifdef WIN32 +// listboxData.push_back("DirectSound8"); +//#endif listBoxSoundFactory.setItems(listboxData); diff --git a/source/shared_lib/include/map/map_preview.h b/source/shared_lib/include/map/map_preview.h index 04ee18bf..73507df8 100644 --- a/source/shared_lib/include/map/map_preview.h +++ b/source/shared_lib/include/map/map_preview.h @@ -17,6 +17,7 @@ #include "randomgen.h" #include "vec.h" #include +#include using Shared::Platform::int8; using Shared::Platform::int32; diff --git a/source/shared_lib/sources/platform/win32/factory_repository.cpp b/source/shared_lib/sources/platform/win32/factory_repository.cpp index 6a530197..61ad1c4a 100644 --- a/source/shared_lib/sources/platform/win32/factory_repository.cpp +++ b/source/shared_lib/sources/platform/win32/factory_repository.cpp @@ -32,21 +32,22 @@ GraphicsFactory *FactoryRepository::getGraphicsFactory(const string &name){ return &graphicsFactoryGl2; } - throw megaglest_runtime_error("Unknown graphics factory: " + name); + throw megaglest_runtime_error("Unknown graphics factory: [" + name + "]"); } SoundFactory *FactoryRepository::getSoundFactory(const string &name){ - if(name == "DirectSound8"){ - return &soundFactoryDs8; - } - else if(name == "OpenAL") { + // deprecated as of 3.6.1 + //if(name == "DirectSound8"){ + // return &soundFactoryDs8; + //} + if(name == "OpenAL") { return &soundFactoryOpenAL; } else if(name == "" || name == "None") { return &soundFactoryNone; } - throw megaglest_runtime_error("Unknown sound factory: " + name); + throw megaglest_runtime_error("Unknown sound factory: [" + name + "]"); } }}//end namespace