Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2011-02-21 13:32:56 +01:00
parent 9c9f1097f8
commit 703ba174a2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/3d/driver/opengl/driver_opengl.h
View file

@ -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)

2
code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
View file

@ -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;
}

4
code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
View file

@ -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.