mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-22 14:23:44 -07:00
Clang format
This commit is contained in:
parent
56021612c4
commit
41fa184d12
1 changed files with 6 additions and 7 deletions
|
@ -360,14 +360,13 @@ static bool AreEntrancesCompatible(Entrance* entrance, Entrance* target, std::ve
|
||||||
entrance->GetParentRegion()->scene != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC &&
|
entrance->GetParentRegion()->scene != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC &&
|
||||||
entrance->GetParentRegion()->scene != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS &&
|
entrance->GetParentRegion()->scene != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS &&
|
||||||
|
|
||||||
(
|
(entrance->GetParentRegion()->scene == target->GetConnectedRegion()->scene ||
|
||||||
entrance->GetParentRegion()->scene == target->GetConnectedRegion()->scene ||
|
|
||||||
|
|
||||||
// prevent SCENE_HYRULE_CASTLE & SCENE_OUTSIDE_GANONS_CASTLE from connecting to eachother
|
// prevent SCENE_HYRULE_CASTLE & SCENE_OUTSIDE_GANONS_CASTLE from connecting to eachother
|
||||||
(entrance->GetParentRegion()->scene == SCENE_HYRULE_CASTLE && target->GetConnectedRegion()->scene == SCENE_OUTSIDE_GANONS_CASTLE) ||
|
(entrance->GetParentRegion()->scene == SCENE_HYRULE_CASTLE &&
|
||||||
(entrance->GetParentRegion()->scene == SCENE_OUTSIDE_GANONS_CASTLE && target->GetConnectedRegion()->scene == SCENE_HYRULE_CASTLE)
|
target->GetConnectedRegion()->scene == SCENE_OUTSIDE_GANONS_CASTLE) ||
|
||||||
)
|
(entrance->GetParentRegion()->scene == SCENE_OUTSIDE_GANONS_CASTLE &&
|
||||||
) {
|
target->GetConnectedRegion()->scene == SCENE_HYRULE_CASTLE))) {
|
||||||
auto message = "Entrance " + entrance->GetName() + " attempted to connect with own scene target " +
|
auto message = "Entrance " + entrance->GetName() + " attempted to connect with own scene target " +
|
||||||
target->to_string() + ". Connection failed.\n";
|
target->to_string() + ". Connection failed.\n";
|
||||||
SPDLOG_DEBUG(message);
|
SPDLOG_DEBUG(message);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue