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

Avoid crashes on server side by supplying (unnecessary) values like

Browse Source 
os_win=0 on linux etc. Added more opengl data to keep the server
happier ... though not yet entirely happy ;)
This commit is contained in:
hiker 2014-09-17 16:08:41 +10:00
parent 8efc7110c8
commit 9035fde10b
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/graphics/irr_driver.cpp
View File

@ -657,23 +657,12 @@ void IrrDriver::initDevice()
} // initDevice } // initDevice
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void IrrDriver::getOpenGLData(std::string *vendor ) void IrrDriver::getOpenGLData(std::string *vendor, std::string *renderer,
std::string *version)
{ {
*vendor = (char*)(glGetString(GL_VENDOR)); *vendor = (char*)glGetString(GL_VENDOR );
#ifdef XX *renderer = (char*)glGetString(GL_RENDERER);
m_gl_major_version = 2; *version = (char*)glGetString(GL_VERSION );
m_gl_minor_version = 1;
// Call to glGetIntegerv should not be made if --no-graphics is used
if(!ProfileWorld::isNoGraphics())
{
glGetIntegerv(GL_MAJOR_VERSION, &m_gl_major_version);
glGetIntegerv(GL_MINOR_VERSION, &m_gl_minor_version);
Log::info("IrrDriver", "OpenGL version: %d.%d", m_gl_major_version, m_gl_minor_version);
Log::info("IrrDriver", "OpenGL vendor: %s", );
Log::info("IrrDriver", "OpenGL renderer: %s", glGetString(GL_RENDERER));
Log::info("IrrDriver", "OpenGL version string: %s", glGetString(GL_VERSION));
#endif
} // getOpenGLData } // getOpenGLData
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
src/graphics/irr_driver.hpp
View File

@ -428,7 +428,8 @@ public:
~IrrDriver(); ~IrrDriver();
void initDevice(); void initDevice();
void reset(); void reset();
void getOpenGLData(std::string *vendor); void getOpenGLData(std::string *vendor, std::string *renderer,
std::string *version);
void generateSkyboxCubemap(); void generateSkyboxCubemap();
void generateDiffuseCoefficients(); void generateDiffuseCoefficients();