diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assign_ids/main.cpp | 3 | ||||
| -rw-r--r-- | tools/datapacker/main.cpp | 4 | ||||
| -rw-r--r-- | tools/validator/validator.cpp | 6 | 
3 files changed, 9 insertions, 4 deletions
| diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp index 8010a9a..4cf7c3f 100644 --- a/tools/assign_ids/main.cpp +++ b/tools/assign_ids/main.cpp | |||
| @@ -112,7 +112,8 @@ class AssignIds { | |||
| 112 | 112 | ||
| 113 | void ProcessDoor(const HumanDoor& h_door, | 113 | void ProcessDoor(const HumanDoor& h_door, | 
| 114 | const std::string& current_map_name) { | 114 | const std::string& current_map_name) { | 
| 115 | if (h_door.type() == DoorType::EVENT && !h_door.latch()) { | 115 | if (h_door.type() == DoorType::EVENT && !h_door.latch() && | 
| 116 | !h_door.legacy_location()) { | ||
| 116 | return; | 117 | return; | 
| 117 | } | 118 | } | 
| 118 | 119 | ||
| diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index cf811c9..8109bf5 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp | |||
| @@ -436,6 +436,10 @@ class DataPacker { | |||
| 436 | if (h_door.has_latch()) { | 436 | if (h_door.has_latch()) { | 
| 437 | door.set_latch(h_door.latch()); | 437 | door.set_latch(h_door.latch()); | 
| 438 | } | 438 | } | 
| 439 | |||
| 440 | if (h_door.has_legacy_location()) { | ||
| 441 | door.set_legacy_location(h_door.legacy_location()); | ||
| 442 | } | ||
| 439 | } | 443 | } | 
| 440 | 444 | ||
| 441 | void ProcessConnectionsFile(std::filesystem::path path, | 445 | void ProcessConnectionsFile(std::filesystem::path path, | 
| diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index a99447a..fe36be7 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp | |||
| @@ -227,8 +227,7 @@ class Validator { | |||
| 227 | 227 | ||
| 228 | if (h_door.type() == DoorType::STANDARD || | 228 | if (h_door.type() == DoorType::STANDARD || | 
| 229 | h_door.type() == DoorType::LOCATION_ONLY || | 229 | h_door.type() == DoorType::LOCATION_ONLY || | 
| 230 | h_door.type() == DoorType::GRAVESTONE || | 230 | h_door.type() == DoorType::GRAVESTONE || h_door.legacy_location()) { | 
| 231 | h_door.type() == DoorType::LEGACY_LOCATION) { | ||
| 232 | if (h_door.double_letters()) { | 231 | if (h_door.double_letters()) { | 
| 233 | std::cout << "Door " << door_identifier.ShortDebugString() | 232 | std::cout << "Door " << door_identifier.ShortDebugString() | 
| 234 | << " is a location that depends on double_letters." | 233 | << " is a location that depends on double_letters." | 
| @@ -241,7 +240,8 @@ class Validator { | |||
| 241 | } | 240 | } | 
| 242 | } | 241 | } | 
| 243 | 242 | ||
| 244 | bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch()); | 243 | bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch() || | 
| 244 | h_door.legacy_location()); | ||
| 245 | if (door_info.has_id != needs_id) { | 245 | if (door_info.has_id != needs_id) { | 
| 246 | if (needs_id) { | 246 | if (needs_id) { | 
| 247 | std::cout << "Door " << door_identifier.ShortDebugString() | 247 | std::cout << "Door " << door_identifier.ShortDebugString() | 
