Changed: #825 Remove all warnings when compiling Ryzom
This commit is contained in:
parent
fbbc4068a8
commit
2cb3acb4c0
5 changed files with 13 additions and 23 deletions
|
@ -35,15 +35,9 @@ class IStream;
|
|||
//------------------ DDS STUFFS --------------------
|
||||
|
||||
#ifndef NL_MAKEFOURCC
|
||||
#ifdef NL_LITTLE_ENDIAN
|
||||
#define NL_MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
||||
((uint32)(uint8)(ch0) | ((uint32)(uint8)(ch1) << 8) | \
|
||||
((uint32)(uint8)(ch2) << 16) | ((uint32)(uint8)(ch3) << 24 ))
|
||||
#else
|
||||
#define NL_MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
||||
((uint32)(uint8)(ch3) | ((uint32)(uint8)(ch2) << 8) | \
|
||||
((uint32)(uint8)(ch1) << 16) | ((uint32)(uint8)(ch0) << 24 ))
|
||||
#endif
|
||||
#define NL_MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
||||
((uint32)(uint8)(ch0) | ((uint32)(uint8)(ch1) << 8) | \
|
||||
((uint32)(uint8)(ch2) << 16) | ((uint32)(uint8)(ch3) << 24 ))
|
||||
#endif
|
||||
|
||||
const uint32 DDS_HEADER = NL_MAKEFOURCC('D', 'D', 'S', ' ');
|
||||
|
|
|
@ -2537,7 +2537,7 @@ bool CDriverGL::isActive()
|
|||
XWindowAttributes attr;
|
||||
Status status = XGetWindowAttributes(_dpy, _win, &attr);
|
||||
|
||||
nlwarning("XGetWindowAttributes returned %d", status);
|
||||
res = (status == 1);
|
||||
|
||||
#endif // NL_OS_UNIX
|
||||
|
||||
|
|
|
@ -173,7 +173,7 @@ uint32 CBackupInterfaceSingleton::pushGenericAckCallback(NLMISC::CSmartPtr<IBack
|
|||
++_Counter;
|
||||
if (!_GenericResponses.empty())
|
||||
{
|
||||
nlassert(((sint32)_GenericResponses.front().first-(sint32)requestId)<0);
|
||||
nlassert(_GenericResponses.front().first<requestId);
|
||||
}
|
||||
|
||||
// if we have no callback then just return the generated request Id...
|
||||
|
|
|
@ -214,9 +214,7 @@ namespace EFFECT_FAMILIES
|
|||
case DMGTYPE::POISON : return DebuffResistPoison;
|
||||
case DMGTYPE::ELECTRICITY : return DebuffResistElectricity;
|
||||
case DMGTYPE::SHOCK : return DebuffResistSchock;
|
||||
default:
|
||||
return Unknown;
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
return Unknown;
|
||||
}
|
||||
|
@ -232,9 +230,7 @@ namespace EFFECT_FAMILIES
|
|||
case DMGTYPE::POISON : return CombatDoTPoison;
|
||||
case DMGTYPE::ELECTRICITY : return CombatDoTElectricity;
|
||||
case DMGTYPE::SHOCK : return CombatDoTShock;
|
||||
default:
|
||||
return Unknown;
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
return Unknown;
|
||||
}
|
||||
|
|
|
@ -836,9 +836,9 @@ bool CScenarioValidator::setScenarioToLoad( const std::string& filename, CScenar
|
|||
static const char * slashheader = "---- /Header\n\n";
|
||||
static const char * comment = "-- ";
|
||||
|
||||
static const unsigned int headerLen = (unsigned int)strlen(header);
|
||||
static const unsigned int slasheaderLen = (unsigned int)strlen(slashheader);
|
||||
static const unsigned int commentLen = (unsigned int)strlen(comment);
|
||||
static const uint headerLen = (uint)strlen(header);
|
||||
static const uint slasheaderLen = (uint)strlen(slashheader);
|
||||
static const uint commentLen = (uint)strlen(comment);
|
||||
|
||||
|
||||
NLMISC::CSString tmp;
|
||||
|
@ -1095,9 +1095,9 @@ bool CUserComponentValidator::setUserComponentToLoad( const std::string& filenam
|
|||
static const char * slashheader = "---- /Header\n\n";
|
||||
static const char * comment = "-- ";
|
||||
|
||||
static const unsigned int headerLen = (unsigned int)strlen(header);
|
||||
static const unsigned int slasheaderLen = (unsigned int)strlen(slashheader);
|
||||
static const unsigned int commentLen = (unsigned int)strlen(comment);
|
||||
static const uint headerLen = (uint)strlen(header);
|
||||
static const uint slasheaderLen = (uint)strlen(slashheader);
|
||||
static const uint commentLen = (uint)strlen(comment);
|
||||
|
||||
|
||||
NLMISC::CSString tmp;
|
||||
|
|
Loading…
Reference in a new issue