mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix more merge conflicts
This commit is contained in:
parent
c390e9f521
commit
7f6b2525a7
|
@ -285,10 +285,6 @@ static rct_widget window_object_load_error_widgets[] = {
|
||||||
{ WIDGETS_END },
|
{ WIDGETS_END },
|
||||||
};
|
};
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
static rct_string_id get_object_type_string(ObjectType type);
|
|
||||||
>>>>>>> upstream/develop
|
|
||||||
static void window_object_load_error_close(rct_window *w);
|
static void window_object_load_error_close(rct_window *w);
|
||||||
static void window_object_load_error_update(rct_window *w);
|
static void window_object_load_error_update(rct_window *w);
|
||||||
static void window_object_load_error_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
static void window_object_load_error_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||||
|
@ -376,17 +372,6 @@ static rct_string_id get_object_type_string(ObjectType type)
|
||||||
*/
|
*/
|
||||||
static void copy_object_names_to_clipboard(rct_window* w)
|
static void copy_object_names_to_clipboard(rct_window* w)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
std::stringstream ss;
|
|
||||||
for (uint16_t i = 0; i < w->no_list_items; i++)
|
|
||||||
{
|
|
||||||
const auto& entry = _invalid_entries[i];
|
|
||||||
ss << entry.GetName();
|
|
||||||
ss << PLATFORM_NEWLINE;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto clip = ss.str();
|
|
||||||
=======
|
|
||||||
std::stringstream stream;
|
std::stringstream stream;
|
||||||
for (uint16_t i = 0; i < w->no_list_items; i++)
|
for (uint16_t i = 0; i < w->no_list_items; i++)
|
||||||
{
|
{
|
||||||
|
@ -396,7 +381,6 @@ static void copy_object_names_to_clipboard(rct_window* w)
|
||||||
}
|
}
|
||||||
|
|
||||||
auto clip = stream.str();
|
auto clip = stream.str();
|
||||||
>>>>>>> upstream/develop
|
|
||||||
OpenRCT2::GetContext()->GetUiContext()->SetClipboardText(clip.c_str());
|
OpenRCT2::GetContext()->GetUiContext()->SetClipboardText(clip.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1425,22 +1425,7 @@ std::vector<uint8_t> NetworkBase::save_for_network(const std::vector<const Objec
|
||||||
{
|
{
|
||||||
std::vector<uint8_t> result;
|
std::vector<uint8_t> result;
|
||||||
auto ms = OpenRCT2::MemoryStream();
|
auto ms = OpenRCT2::MemoryStream();
|
||||||
<<<<<<< HEAD
|
|
||||||
if (SaveMap(&ms, objects))
|
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());
|
result.resize(ms.GetLength());
|
||||||
std::memcpy(result.data(), ms.GetData(), result.size());
|
std::memcpy(result.data(), ms.GetData(), result.size());
|
||||||
|
|
|
@ -57,7 +57,3 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
void get_type_entry_index(size_t index, ObjectType* outObjectType, ObjectEntryIndex* outEntryIndex);
|
void get_type_entry_index(size_t index, ObjectType* outObjectType, ObjectEntryIndex* outEntryIndex);
|
||||||
<<<<<<< HEAD
|
|
||||||
void* get_loaded_object_chunk(size_t index);
|
|
||||||
=======
|
|
||||||
>>>>>>> upstream/develop
|
|
||||||
|
|
Loading…
Reference in New Issue