Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/sound/sound_bank.cpp
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;
} }

5
code/ryzom/common/src/game_share/http_client.cpp
View file

@ -193,20 +193,21 @@ bool CHttpClient::receive(string &res, bool verbose)
if (_Sock.receive((uint8*)buf, size, false) == CSock::Ok) if (_Sock.receive((uint8*)buf, size, false) == CSock::Ok)
{ {
if(verbose) nlinfo("Received OK %d bytes", size); if (verbose) nlinfo("Received OK %d bytes", size);
buf[1023] = '\0'; buf[1023] = '\0';
res += (char*)buf; res += (char*)buf;
//nlinfo("block received '%s'", buf); //nlinfo("block received '%s'", buf);
} }
else else
{ {
if(verbose) nlinfo("Received CLOSE %d bytes", size); if (verbose) nlinfo("Received CLOSE %d bytes", size);
buf[size] = '\0'; buf[size] = '\0';
res += (char*)buf; res += (char*)buf;
//nlwarning ("server connection closed"); //nlwarning ("server connection closed");
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