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

Merge pull request #1325 from solistice/properties

Browse Source 
small patch for --no-graphics mode and small bug fix
This commit is contained in:
hiker
2014-05-15 08:42:31 +10:00
parent 229b461a6c f521ba0242
commit 5966cefed9
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/graphics/irr_driver.cpp
View File

@@ -436,16 +436,24 @@ void IrrDriver::initDevice()
GLMajorVersion = 2;
GLMinorVersion = 1;
glGetIntegerv(GL_MAJOR_VERSION, &GLMajorVersion);
glGetIntegerv(GL_MINOR_VERSION, &GLMinorVersion);
// Call to glGetIntegerv should not be made if --no-graphics is used
if(!ProfileWorld::isNoGraphics())
{
glGetIntegerv(GL_MAJOR_VERSION, &GLMajorVersion);
glGetIntegerv(GL_MINOR_VERSION, &GLMinorVersion);
}
Log::info("IrrDriver", "OPENGL VERSION IS %d.%d", GLMajorVersion, GLMinorVersion);
m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));
// Parse extensions
hasVSLayer = false;
const GLubyte *extensions = glGetString(GL_EXTENSIONS);
if (extensions && strstr((const char*)extensions, "GL_AMD_vertex_shader_layer") != NULL)
// Default false value for hasVSLayer if --no-graphics argument is used
if (!ProfileWorld::isNoGraphics())
{
const GLubyte *extensions = glGetString(GL_EXTENSIONS);
if (extensions && strstr((const char*)extensions, "GL_AMD_vertex_shader_layer") != NULL)
hasVSLayer = true;
}
@@ -1201,7 +1209,7 @@ void IrrDriver::suppressSkyBox()
{
SkyboxTextures.clear();
SphericalHarmonicsTextures.clear();
if (SkyboxCubeMap)
if ((SkyboxCubeMap) && (!ProfileWorld::isNoGraphics()))
glDeleteTextures(1, &SkyboxCubeMap);
SkyboxCubeMap = 0;
}

4
src/karts/controller/skidding_ai.cpp
View File

@@ -1276,8 +1276,8 @@ void SkiddingAI::handleItems(const float dt)
break;
// Don't fire if the kart we are aiming at is invulnerable.
if (fire_backwards && m_kart_behind->isInvulnerable() ||
!fire_backwards && m_kart_ahead->isInvulnerable() )
if ((fire_backwards && m_kart_behind && m_kart_behind->isInvulnerable()) ||
(!fire_backwards && m_kart_ahead && m_kart_ahead->isInvulnerable()) )
return;
float distance = fire_backwards ? m_distance_behind