mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-26 16:56:19 +00:00
Merge with develop
This commit is contained in:
parent
9bb4273fe1
commit
7bcf3bfe5c
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())
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -207,6 +207,7 @@ bool CHttpClient::receive(string &res, bool verbose)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//nlinfo("all received '%s'", res.c_str());
|
||||
|
||||
// only keep content (delimited by two \r\n) and discard server headers
|
||||
|
|
Loading…
Reference in a new issue