mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-19 21:03:42 -07:00
post rebase mixups
This commit is contained in:
parent
1f29a8615a
commit
b6c39bc28b
2 changed files with 1 additions and 3 deletions
|
@ -9,8 +9,6 @@
|
||||||
#define ENTRANCE_SHUFFLE_SUCCESS 0
|
#define ENTRANCE_SHUFFLE_SUCCESS 0
|
||||||
#define ENTRANCE_SHUFFLE_FAILURE 1
|
#define ENTRANCE_SHUFFLE_FAILURE 1
|
||||||
|
|
||||||
constexpr std::string CleanCheckConditionString(std::string condition);
|
|
||||||
|
|
||||||
namespace Rando {
|
namespace Rando {
|
||||||
enum class EntranceType {
|
enum class EntranceType {
|
||||||
None,
|
None,
|
||||||
|
|
|
@ -2396,7 +2396,7 @@ typedef enum {
|
||||||
RC_GF_SOUTHMOST_CENTER_CRATE,
|
RC_GF_SOUTHMOST_CENTER_CRATE,
|
||||||
RC_GF_MID_SOUTH_CENTER_CRATE,
|
RC_GF_MID_SOUTH_CENTER_CRATE,
|
||||||
RC_GF_MID_NORTH_CENTER_CRATE,
|
RC_GF_MID_NORTH_CENTER_CRATE,
|
||||||
RR_GF_NORTHMOST_CENTER_CRATE,
|
RC_GF_NORTHMOST_CENTER_CRATE,
|
||||||
RC_GF_OUTSKIRTS_NE_CRATE,
|
RC_GF_OUTSKIRTS_NE_CRATE,
|
||||||
RC_GF_OUTSKIRTS_NW_CRATE,
|
RC_GF_OUTSKIRTS_NW_CRATE,
|
||||||
RC_GF_HBA_RANGE_CRATE_1,
|
RC_GF_HBA_RANGE_CRATE_1,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue