mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-23 07:36:16 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
9e33df4532
2 changed files with 4 additions and 3 deletions
|
@ -363,7 +363,7 @@ CSound* CSoundBank::getSound(const NLMISC::CSheetId &sheetId)
|
||||||
if (sheetId.getShortId() >= _Sounds.size())
|
if (sheetId.getShortId() >= _Sounds.size())
|
||||||
{
|
{
|
||||||
std::string sheetName = sheetId.toString();
|
std::string sheetName = sheetId.toString();
|
||||||
nlwarning("NLSOUND: Sound sheet id '%s' exceeds loaded sound sheets", sheetName.c_str());
|
nldebug("NLSOUND: Sound sheet id '%s' exceeds loaded sound sheets", sheetName.c_str());
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,6 +207,7 @@ bool CHttpClient::receive(string &res, bool verbose)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//nlinfo("all received '%s'", res.c_str());
|
//nlinfo("all received '%s'", res.c_str());
|
||||||
|
|
||||||
// only keep content (delimited by two \r\n) and discard server headers
|
// only keep content (delimited by two \r\n) and discard server headers
|
||||||
|
|
Loading…
Reference in a new issue