diff --git a/code/nel/include/nel/3d/index_buffer.h b/code/nel/include/nel/3d/index_buffer.h index 2b0244a49..320a06020 100644 --- a/code/nel/include/nel/3d/index_buffer.h +++ b/code/nel/include/nel/3d/index_buffer.h @@ -736,7 +736,9 @@ inline void CIndexBuffer::lock (CIndexBufferReadWrite &accessor, uint first, uin } } else + { nlassert ((first==0)&&(last==0)); + } _LockCounter++; } @@ -771,7 +773,9 @@ inline void CIndexBuffer::lock (CIndexBufferRead &accessor, uint first, uint las } } else + { nlassert ((first==0)&&(last==0)); + } _LockCounter++; } diff --git a/code/nel/include/nel/3d/vertex_buffer.h b/code/nel/include/nel/3d/vertex_buffer.h index 923bc27b0..83b2b90ea 100644 --- a/code/nel/include/nel/3d/vertex_buffer.h +++ b/code/nel/include/nel/3d/vertex_buffer.h @@ -1177,7 +1177,9 @@ inline void CVertexBuffer::lock (CVertexBufferReadWrite &accessor, uint first, u } } else + { nlassert ((first==0)&&(last==0)); + } _LockCounter++; } @@ -1212,7 +1214,9 @@ inline void CVertexBuffer::lock (CVertexBufferRead &accessor, uint first, uint l } } else + { nlassert ((first==0)&&(last==0)); + } _LockCounter++; } diff --git a/code/nel/src/3d/font_generator.cpp b/code/nel/src/3d/font_generator.cpp index 73f05a6f4..be99d77b9 100644 --- a/code/nel/src/3d/font_generator.cpp +++ b/code/nel/src/3d/font_generator.cpp @@ -104,13 +104,13 @@ CFontGenerator::CFontGenerator (const std::string &fontFileName, const std::stri } string fontEx = fontExFileName; - if (fontEx == "") + if (fontEx.empty()) { // try to see if the ex filename exists based on the fontExFileName fontEx = CPath::lookup(CFile::getFilenameWithoutExtension (fontFileName)+".afm", false, false); } - if (fontEx != "") + if (!fontEx.empty()) { error = FT_Attach_File (_Face, fontEx.c_str ()); if (error)