Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-05-08 19:24:04 +02:00
commit 9e33df4532
2 changed files with 4 additions and 3 deletions

View file

@ -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;
} }

View file

@ -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