From abe721b30843c78cc8ec3b2d446f8aa538ae040b Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 21 Aug 2019 21:46:03 +0200 Subject: [PATCH] Fix rebase errors and formatting --- src/openrct2-ui/windows/EditorInventionsList.cpp | 1 - src/openrct2/rct12/RCT12.h | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 0f655368ce..d25c3d9a51 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -223,7 +223,6 @@ static void move_research_item(ResearchItem* beforeItem, int32_t scrollIndex) gResearchItemsInvented.push_back(_editorInventionsListDraggedItem); } } - } else if (scrollIndex == 1) { diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index bfcbce33d4..4f2a8f7d6a 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -49,7 +49,6 @@ constexpr uint16_t const RCT12_MAX_INVERSIONS = 31; constexpr uint16_t const RCT12_MAX_GOLF_HOLES = 31; constexpr uint16_t const RCT12_MAX_HELICES = 31; -<<<<<<< HEAD enum class RCT12TrackDesignVersion : uint8_t { TD4, @@ -57,14 +56,13 @@ enum class RCT12TrackDesignVersion : uint8_t TD6, unknown }; -======= + // Everything before this point has been researched #define RCT12_RESEARCHED_ITEMS_SEPARATOR (-1) // Everything before this point and after separator still requires research #define RCT12_RESEARCHED_ITEMS_END (-2) // Extra end of list entry. Leftover from RCT1. #define RCT12_RESEARCHED_ITEMS_END_2 (-3) ->>>>>>> 04e9e626d... Split off RCT12ResearchItem #pragma pack(push, 1)