From 5469274e1439082b108d39eb5b12a5037d651d1e Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 1 Aug 2010 10:45:50 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/nel/src/3d/driver/opengl/driver_opengl_states.cpp | 2 +- code/nel/src/misc/async_file_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp index 70924a51a..cecd9ed0e 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp @@ -405,7 +405,7 @@ void CDriverGLStates::stencilFunc(GLenum func, GLint ref, GLuint mask) #endif { // new state - _CurStencilFunc = stencilFunc; + _CurStencilFunc = func; _CurStencilRef = ref; _CurStencilMask = mask; diff --git a/code/nel/src/misc/async_file_manager.cpp b/code/nel/src/misc/async_file_manager.cpp index 878ddfd60..bd019dd5e 100644 --- a/code/nel/src/misc/async_file_manager.cpp +++ b/code/nel/src/misc/async_file_manager.cpp @@ -260,7 +260,7 @@ void CAsyncFileManager::CMultipleFileLoad::run (void) //fseek (f, 0, SEEK_SET); ptr = new uint8[filesize]; if (fread (ptr, filesize, 1, f) != 1) - nlwarning("AFM: Couldn't read '%s'", _FileName[i].c_str()); + nlwarning("AFM: Couldn't read '%s'", _FileNames[i].c_str()); fclose (f); *_Ptrs[i] = ptr;