diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.h b/code/nel/src/3d/driver/opengl/driver_opengl.h index 56ed5d14c..cbe651e0b 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl.h @@ -117,13 +117,13 @@ class COcclusionQueryGL; bool GlWndProc(CDriverGL *driver, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); typedef HCURSOR nlCursor; -#define EmptyCursor NULL +#define EmptyCursor (nlCursor)NULL #elif defined (NL_OS_MAC) bool GlWndProc(CDriverGL *driver, const void* e); typedef void* nlCursor; -#define EmptyCursor NULL +#define EmptyCursor (nlCursor)NULL #elif defined (NL_OS_UNIX) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp index 260dcd5af..b957b372a 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp @@ -407,7 +407,7 @@ nlCursor CDriverGL::buildCursor(const CBitmap &src, NLMISC::CRGBA col, uint8 rot } // create a cursor from bitmap - nlCursor result = NULL; + nlCursor result = EmptyCursor; convertBitmapToCursor(rotSrc, result, mouseW, mouseH, _ColorDepth == ColorDepth16 ? 16:32, col, hotSpotX, hotSpotY); return result; } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp index 028dd1614..569aceb0c 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp @@ -251,8 +251,8 @@ bool CDriverGL::setupMaterial(CMaterial& mat) { H_AUTO_OGL(CDriverGL_setupMaterial) CShaderGL* pShader; - GLenum glenum; - uint32 touched=mat.getTouched(); + GLenum glenum = GL_ZERO; + uint32 touched = mat.getTouched(); uint stage; // profile.