mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix rebase errors and formatting

This commit is contained in:
Gymnasiast 2019-08-21 21:46:03 +02:00
parent 984fd5e58a
commit abe721b308
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -223,7 +223,6 @@ static void move_research_item(ResearchItem* beforeItem, int32_t scrollIndex)
gResearchItemsInvented.push_back(_editorInventionsListDraggedItem); gResearchItemsInvented.push_back(_editorInventionsListDraggedItem);
} }
} }
} }
else if (scrollIndex == 1) else if (scrollIndex == 1)
{ {

4
src/openrct2/rct12/RCT12.h
View File

@ -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_GOLF_HOLES = 31;
constexpr uint16_t const RCT12_MAX_HELICES = 31; constexpr uint16_t const RCT12_MAX_HELICES = 31;
<<<<<<< HEAD
enum class RCT12TrackDesignVersion : uint8_t enum class RCT12TrackDesignVersion : uint8_t
{ {
TD4, TD4,
@ -57,14 +56,13 @@ enum class RCT12TrackDesignVersion : uint8_t
TD6, TD6,
unknown unknown
}; };
=======
// Everything before this point has been researched // Everything before this point has been researched
#define RCT12_RESEARCHED_ITEMS_SEPARATOR (-1) #define RCT12_RESEARCHED_ITEMS_SEPARATOR (-1)
// Everything before this point and after separator still requires research // Everything before this point and after separator still requires research
#define RCT12_RESEARCHED_ITEMS_END (-2) #define RCT12_RESEARCHED_ITEMS_END (-2)
// Extra end of list entry. Leftover from RCT1. // Extra end of list entry. Leftover from RCT1.
#define RCT12_RESEARCHED_ITEMS_END_2 (-3) #define RCT12_RESEARCHED_ITEMS_END_2 (-3)
>>>>>>> 04e9e626d... Split off RCT12ResearchItem
#pragma pack(push, 1) #pragma pack(push, 1)