mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Fix more merge conflicts

Browse Source
This commit is contained in:
Ted John
2021-09-17 21:17:23 +01:00
parent c390e9f521
commit 7f6b2525a7
3 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/network/NetworkBase.cpp
View File

@@ -1425,22 +1425,7 @@ std::vector<uint8_t> NetworkBase::save_for_network(const std::vector<const Objec
{
std::vector<uint8_t> result;
auto ms = OpenRCT2::MemoryStream();
<<<<<<< HEAD
if (SaveMap(&ms, objects))
=======
if (!SaveMap(&ms, objects))
{
log_warning("Failed to export map.");
return header;
}
gUseRLE = RLEState;
const void* data = ms.GetData();
int32_t size = ms.GetLength();
auto compressed = util_zlib_deflate(static_cast<const uint8_t*>(data), size);
if (compressed.has_value())
>>>>>>> upstream/develop
{
result.resize(ms.GetLength());
std::memcpy(result.data(), ms.GetData(), result.size());