Changed: #825 Remove all warning when compiling Ryzom

This commit is contained in:
kervala 2010-07-16 22:23:45 +02:00
parent 67d5518aaf
commit 1ee2dd6f6a
3 changed files with 5 additions and 5 deletions

View file

@ -611,7 +611,7 @@ void CViewRenderer::drawQuad(sint layerId, const NLMISC::CQuadUV &quadUV, sint32
std::swap(pUV0, pUV1); std::swap(pUV0, pUV1);
} }
nlassert(count <= maxNumCorners); nlassert(count <= (sint)maxNumCorners);
if (count >= 3) if (count >= 3)
{ {
count -= 2; count -= 2;
@ -1088,7 +1088,7 @@ CRGBA CViewRenderer::getTextureColor(sint32 id, sint32 x, sint32 y)
sint32 CViewRenderer::getTypoTextureW(char c) sint32 CViewRenderer::getTypoTextureW(char c)
{ {
if ((c>=0) && (c<NumTypoChar)) if ((c>=0) && (c<NumTypoChar))
return _TypoCharWs[c]; return _TypoCharWs[(uint)c];
else else
return 1; return 1;
} }
@ -1103,7 +1103,7 @@ sint32 CViewRenderer::getTypoTextureH(char /* c */)
sint32 CViewRenderer::getTypoTextureId(char c) sint32 CViewRenderer::getTypoTextureId(char c)
{ {
if ((c>=0) && (c<NumTypoChar)) if ((c>=0) && (c<NumTypoChar))
return _TypoCharToTextureIds[c]; return _TypoCharToTextureIds[(uint)c];
else else
return -1; return -1;
} }

View file

@ -3166,7 +3166,7 @@ private:
ucstring web_app; ucstring web_app;
uint i; uint i;
const uint digitStart= 6; const uint digitStart= 6;
const uint digitMaxEnd= contentStr.size(); const uint digitMaxEnd= (uint)contentStr.size();
is_webig = true; is_webig = true;

View file

@ -82,7 +82,7 @@ void CPage::init (uint id, const char *name, bool bold, uint icon, uint resid, C
Parent = parent; Parent = parent;
Icon = icon; Icon = icon;
ResId = resid; ResId = resid;
ChildId = parent->Children.size (); ChildId = (uint)parent->Children.size ();
if (parent) if (parent)
parent->Children.push_back (this); parent->Children.push_back (this);
Name = name; Name = name;