mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix rebase errors and formatting
This commit is contained in:
parent
984fd5e58a
commit
abe721b308
|
@ -223,7 +223,6 @@ static void move_research_item(ResearchItem* beforeItem, int32_t scrollIndex)
|
|||
gResearchItemsInvented.push_back(_editorInventionsListDraggedItem);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else if (scrollIndex == 1)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue