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

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-08-01 09:53:45 +02:00
parent 65647fecbb
commit 540e24b7b6
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -397,11 +397,11 @@ void CDriverGLStates::alphaFunc(float threshold)
// *************************************************************************** // ***************************************************************************
void CDriverGLStates::stencilFunc(GLenum stencilFunc, GLint ref, GLuint mask) void CDriverGLStates::stencilFunc(GLenum func, GLint ref, GLuint mask)
{ {
H_AUTO_OGL(CDriverGLStates_stencilFunc) H_AUTO_OGL(CDriverGLStates_stencilFunc)
#ifndef NL3D_GLSTATE_DISABLE_CACHE #ifndef NL3D_GLSTATE_DISABLE_CACHE
if((stencilFunc!=_CurStencilFunc) || (ref!=_CurStencilRef) || (mask!=_CurStencilMask)) if((func!=_CurStencilFunc) || (ref!=_CurStencilRef) || (mask!=_CurStencilMask))
#endif #endif
{ {
// new state // new state

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

@ -1939,8 +1939,7 @@ bool CDriverGL::getRenderTargetSize (uint32 &width, uint32 &height)
} }
else else
{ {
width = _WindowWidth; getWindowSize(width, height);
height = _WindowHeight;
} }
return false; return false;

7
code/nel/src/misc/dynloadlib.cpp
View file

@ -208,11 +208,12 @@ bool CLibrary::loadLibrary(const std::string &libName, bool addNelDecoration, bo
_LibHandle = nlLoadLibrary(libPath); _LibHandle = nlLoadLibrary(libPath);
_LibFileName = libPath; _LibFileName = libPath;
// MTR: some new error handling. Just logs if it couldn't load the handle. // MTR: some new error handling. Just logs if it couldn't load the handle.
if(_LibHandle == NULL) { if(_LibHandle == NULL)
{
#ifdef NL_OS_UNIX #ifdef NL_OS_UNIX
char *errormsg=dlerror(); const char *errormsg = dlerror();
#else #else
const char *errormsg="Verify DLL existence"; const char *errormsg = "Verify DLL existence";
#endif #endif
nlwarning("Loading library %s failed: %s", libPath.c_str(), errormsg); nlwarning("Loading library %s failed: %s", libPath.c_str(), errormsg);
} }