From: <id...@us...> - 2010-03-02 20:20:53
|
Revision: 3357 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3357&view=rev Author: id-ego Date: 2010-03-02 20:20:21 +0000 (Tue, 02 Mar 2010) Log Message: ----------- Compatibility changes for more recent Ogre versions (e.g. 1.7.0) Modified Paths: -------------- trunk/FreeOrion/UI/PagedGeometry/PagedGeometry.cpp trunk/FreeOrion/client/human/chmain.cpp Modified: trunk/FreeOrion/UI/PagedGeometry/PagedGeometry.cpp =================================================================== --- trunk/FreeOrion/UI/PagedGeometry/PagedGeometry.cpp 2010-02-24 05:07:43 UTC (rev 3356) +++ trunk/FreeOrion/UI/PagedGeometry/PagedGeometry.cpp 2010-03-02 20:20:21 UTC (rev 3357) @@ -371,7 +371,7 @@ float PagedGeometry::getCustomParam(string paramName, float defaultParamValue) const { - map<string, float>::const_iterator it; + std::map<string, float>::const_iterator it; it = customParam.find(paramName); if (it != customParam.end()) { float x = it->second; Modified: trunk/FreeOrion/client/human/chmain.cpp =================================================================== --- trunk/FreeOrion/client/human/chmain.cpp 2010-02-24 05:07:43 UTC (rev 3356) +++ trunk/FreeOrion/client/human/chmain.cpp 2010-03-02 20:20:21 UTC (rev 3357) @@ -183,6 +183,11 @@ root->installPlugin(gl_plugin); #endif +#ifdef FREEORION_MACOSX + RenderSystem* selected_render_system = root->getRenderSystemByName("OpenGL Rendering Subsystem"); + if (selected_render_system == 0) + throw std::runtime_error("Failed to find an Ogre GL render system."); +#else RenderSystemList* renderers_list = root->getAvailableRenderers(); bool failed = true; RenderSystem* selected_render_system = 0; @@ -196,6 +201,7 @@ } if (failed) throw std::runtime_error("Failed to find an Ogre GL render system."); +#endif root->setRenderSystem(selected_render_system); |