dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multi-packet network content requests (ContentVector)

Browse Source 
Broken by incorrect merge conflict resolution in ba34ec7ad

See #86
This commit is contained in:
Jonathan G Rennison
2019-04-18 22:53:44 +01:00
parent 8715574c4a
commit ede88aa6cd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/network_content.cpp
View File

@@ -255,7 +255,8 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
const uint to_send = min<uint>(cv->size() - offset, max_per_packet); const uint to_send = min<uint>(cv->size() - offset, max_per_packet);
p->Send_uint8(to_send); p->Send_uint8(to_send);
for (const ContentInfo *ci : *cv) { for (uint i = 0; i < to_send; i++) {
const ContentInfo *ci = (*cv)[offset + i];
p->Send_uint8((byte)ci->type); p->Send_uint8((byte)ci->type);
p->Send_uint32(ci->unique_id); p->Send_uint32(ci->unique_id);
if (!send_md5sum) continue; if (!send_md5sum) continue;