mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-12 02:09:52 +00:00
Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
860aa8da13
commit
5f6bf688d8
3 changed files with 7 additions and 7 deletions
|
@ -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
|
||||||
|
|
|
@ -1939,8 +1939,7 @@ bool CDriverGL::getRenderTargetSize (uint32 &width, uint32 &height)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
width = _WindowWidth;
|
getWindowSize(width, height);
|
||||||
height = _WindowHeight;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue