Changed: #825 Remove all warnings when compiling Ryzom
This commit is contained in:
parent
35499ce0c4
commit
fbd2ae7cfa
5 changed files with 10 additions and 8 deletions
|
@ -174,7 +174,7 @@ class CContextSoundContainer : public IContextSoundContainer
|
|||
return;
|
||||
nlassertex(i==NbJoker, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
|
||||
|
||||
int randomValue;
|
||||
sint randomValue = 0;
|
||||
if (UseRandom)
|
||||
{
|
||||
bool ok = false;
|
||||
|
|
|
@ -80,11 +80,11 @@ bool CWindowDisplayer::update ()
|
|||
|
||||
uint CWindowDisplayer::createLabel (const char *value)
|
||||
{
|
||||
int pos;
|
||||
uint pos;
|
||||
{
|
||||
CSynchronized<std::vector<CLabelEntry> >::CAccessor access (&_Labels);
|
||||
access.value().push_back (CLabelEntry(value));
|
||||
pos = (int)access.value().size()-1;
|
||||
pos = (uint)access.value().size()-1;
|
||||
}
|
||||
return pos;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ namespace NLSOUND
|
|||
{
|
||||
|
||||
CMusicChannelAL::CMusicChannelAL(CSoundDriverAL *soundDriver)
|
||||
: _MusicBuffer(NULL), _SoundDriver(soundDriver), _Gain(1.0), _Source(NULL), _Thread(NULL), _Async(false), _Playing(false), _Buffer(NULL)
|
||||
: _SoundDriver(soundDriver), _MusicBuffer(NULL), _Thread(NULL), _Buffer(NULL), _Source(NULL), _Playing(false), _Async(false), _Gain(1.0)
|
||||
{
|
||||
// create a default source for music streaming
|
||||
_Source = static_cast<CSourceAL*>(_SoundDriver->createSource());
|
||||
|
|
|
@ -33,7 +33,7 @@ public:
|
|||
bool readString (string &str, FILE *file)
|
||||
{
|
||||
int c;
|
||||
while (c = fgetc (file))
|
||||
while ((c = fgetc (file)))
|
||||
{
|
||||
if (c == EOF)
|
||||
return false;
|
||||
|
@ -47,7 +47,7 @@ int main(int argc, char* argv[])
|
|||
if (argc>1)
|
||||
{
|
||||
char buffer[512];
|
||||
while (gets (buffer))
|
||||
while (fgets(buffer, 512, stdin))
|
||||
{
|
||||
uint32 address;
|
||||
if (strcmp (buffer, "help") == 0)
|
||||
|
|
|
@ -788,6 +788,8 @@ struct TPredicateNode : public TQueryNode
|
|||
ts.EndDate = ~0;
|
||||
tl.push_back(ts);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return tl;
|
||||
|
@ -1163,8 +1165,8 @@ public:
|
|||
/// The iterator in the string where the error is detected
|
||||
iterator It;
|
||||
/// The error string
|
||||
char *ErrorStr;
|
||||
EInvalidQuery(iterator it, char *erroStr)
|
||||
const char *ErrorStr;
|
||||
EInvalidQuery(iterator it, const char *erroStr)
|
||||
: It(it),
|
||||
ErrorStr(erroStr)
|
||||
{}
|
||||
|
|
Loading…
Reference in a new issue