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 2010-12-12 15:10:53 +01:00
parent bceb33ab10
commit 028e2e0f49
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/3d/index_buffer.h
View file

@ -736,7 +736,9 @@ inline void CIndexBuffer::lock (CIndexBufferReadWrite &accessor, uint first, uin
} }
} }
else else
{
nlassert ((first==0)&&(last==0)); nlassert ((first==0)&&(last==0));
}
_LockCounter++; _LockCounter++;
} }
@ -771,7 +773,9 @@ inline void CIndexBuffer::lock (CIndexBufferRead &accessor, uint first, uint las
} }
} }
else else
{
nlassert ((first==0)&&(last==0)); nlassert ((first==0)&&(last==0));
}
_LockCounter++; _LockCounter++;
} }

4
code/nel/include/nel/3d/vertex_buffer.h
View file

@ -1177,7 +1177,9 @@ inline void CVertexBuffer::lock (CVertexBufferReadWrite &accessor, uint first, u
} }
} }
else else
{
nlassert ((first==0)&&(last==0)); nlassert ((first==0)&&(last==0));
}
_LockCounter++; _LockCounter++;
} }
@ -1212,7 +1214,9 @@ inline void CVertexBuffer::lock (CVertexBufferRead &accessor, uint first, uint l
} }
} }
else else
{
nlassert ((first==0)&&(last==0)); nlassert ((first==0)&&(last==0));
}
_LockCounter++; _LockCounter++;
} }

4
code/nel/src/3d/font_generator.cpp
View file

@ -104,13 +104,13 @@ CFontGenerator::CFontGenerator (const std::string &fontFileName, const std::stri
} }
string fontEx = fontExFileName; string fontEx = fontExFileName;
if (fontEx == "") if (fontEx.empty())
{ {
// try to see if the ex filename exists based on the fontExFileName // try to see if the ex filename exists based on the fontExFileName
fontEx = CPath::lookup(CFile::getFilenameWithoutExtension (fontFileName)+".afm", false, false); fontEx = CPath::lookup(CFile::getFilenameWithoutExtension (fontFileName)+".afm", false, false);
} }
if (fontEx != "") if (!fontEx.empty())
{ {
error = FT_Attach_File (_Face, fontEx.c_str ()); error = FT_Attach_File (_Face, fontEx.c_str ());
if (error) if (error)