ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'addonserver-fixes' of https://github.com/Flakebi/stk-code into Flakebi-addonserver-fixes

Browse Source
This commit is contained in:
hiker
2015-03-11 10:25:52 +11:00
parent 886c0e3e9f ded59ac81e
commit 0259522be3
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/addons/addons_manager.cpp
View File

@@ -583,13 +583,19 @@ bool AddonsManager::uninstall(const Addon &addon)
*/
void AddonsManager::saveInstalled()
{
//Put the addons in the xml file
//Manually because the irrlicht xml writer doesn't seem finished, FIXME ?
// Put the addons in the xml file
// Manually because the irrlicht xml writer doesn't seem finished, FIXME ?
std::ofstream xml_installed(m_file_installed.c_str());
//write the header of the xml file
// Write the header of the xml file
xml_installed << "<?xml version=\"1.0\"?>" << std::endl;
xml_installed << "<addons xmlns='http://stkaddons.net/'>"
// Get server address from config
std::string server = UserConfigParams::m_server_addons;
// Find the third slash (end of the domain)
std::string::size_type index = server.find('/');
index = server.find('/', index + 2) + 1; // Omit one slash
xml_installed << "<addons xmlns='" << server.substr(0, index) << "'>"
<< std::endl;
for(unsigned int i = 0; i < m_addons_list.getData().size(); i++)

3
src/config/hardware_stats.cpp
View File

@@ -313,9 +313,6 @@ void reportHardwareStats()
std::string vendor, renderer, full_version;
irr_driver->getOpenGLData(&vendor, &renderer, &full_version);
json.add("GL_VENDOR", vendor );
json.add("GL_RENDERER", renderer );
json.add("GL_VERSION", full_version );
json.add("gfx_drv_ver", "OpenGL "+vendor);
std::string card_name = vendor;