From ab0ae74358c3b7dcff81407601881efe5b84583c Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 15 May 2012 12:55:56 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- .../src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp | 4 ++-- code/nel/src/3d/driver/opengl/driver_opengl_window.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp index 8f9551248..706b0f0eb 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp @@ -1219,7 +1219,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff nglGenBuffersARB(1, &vertexBufferID); #endif - if (glGetError() != GL_NO_ERROR) return false; + if (glGetError() != GL_NO_ERROR) return NULL; _Driver->_DriverGLStates.forceBindARBVertexBuffer(vertexBufferID); switch(_VBType) { @@ -1256,7 +1256,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff nglDeleteBuffersARB(1, &vertexBufferID); #endif - return false; + return NULL; } CVertexBufferHardARB *newVbHard= new CVertexBufferHardARB(_Driver, vb); newVbHard->initGL(vertexBufferID, this, _VBType); diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index ea8be02e9..213959f61 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -346,9 +346,12 @@ bool CDriverGL::init (uint windowIcon, emptyProc exitFunc) #elif defined(NL_OS_MAC) // nothing to do + nlunreferenced(windowIcon); #elif defined (NL_OS_UNIX) + nlunreferenced(windowIcon); + _dpy = XOpenDisplay(NULL); if (_dpy == NULL)