diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2025-10-20 18:33:18 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2025-10-20 18:33:18 -0400 |
| commit | 2ea5762540a67ba20c5cb72c89c5cf62c7e9bfd5 (patch) | |
| tree | cb6fa51b3a70a7f2b3ac099b7c34c9a7f730cc2b /tools | |
| parent | 4c1dc83759d15b7f9f8aaddf580d2147f43fb845 (diff) | |
| download | lingo2-archipelago-2ea5762540a67ba20c5cb72c89c5cf62c7e9bfd5.tar.gz lingo2-archipelago-2ea5762540a67ba20c5cb72c89c5cf62c7e9bfd5.tar.bz2 lingo2-archipelago-2ea5762540a67ba20c5cb72c89c5cf62c7e9bfd5.zip | |
Mark some doors as "latched"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assign_ids/main.cpp | 2 | ||||
| -rw-r--r-- | tools/datapacker/main.cpp | 4 | ||||
| -rw-r--r-- | tools/validator/validator.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
| diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp index 3e16f78..357566a 100644 --- a/tools/assign_ids/main.cpp +++ b/tools/assign_ids/main.cpp | |||
| @@ -111,7 +111,7 @@ class AssignIds { | |||
| 111 | 111 | ||
| 112 | void ProcessDoor(const HumanDoor& h_door, | 112 | void ProcessDoor(const HumanDoor& h_door, |
| 113 | const std::string& current_map_name) { | 113 | const std::string& current_map_name) { |
| 114 | if (h_door.type() == DoorType::EVENT) { | 114 | if (h_door.type() == DoorType::EVENT && !h_door.latch()) { |
| 115 | return; | 115 | return; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 9b487e4..fe520aa 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp | |||
| @@ -431,6 +431,10 @@ class DataPacker { | |||
| 431 | if (h_door.has_double_letters()) { | 431 | if (h_door.has_double_letters()) { |
| 432 | door.set_double_letters(h_door.double_letters()); | 432 | door.set_double_letters(h_door.double_letters()); |
| 433 | } | 433 | } |
| 434 | |||
| 435 | if (h_door.has_latch()) { | ||
| 436 | door.set_latch(h_door.latch()); | ||
| 437 | } | ||
| 434 | } | 438 | } |
| 435 | 439 | ||
| 436 | void ProcessConnectionsFile(std::filesystem::path path, | 440 | void ProcessConnectionsFile(std::filesystem::path path, |
| diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index c048bab..d651e04 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp | |||
| @@ -234,7 +234,7 @@ class Validator { | |||
| 234 | << std::endl; | 234 | << std::endl; |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | bool needs_id = (h_door.type() != DoorType::EVENT); | 237 | bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch()); |
| 238 | if (door_info.has_id != needs_id) { | 238 | if (door_info.has_id != needs_id) { |
| 239 | if (needs_id) { | 239 | if (needs_id) { |
| 240 | std::cout << "Door " << door_identifier.ShortDebugString() | 240 | std::cout << "Door " << door_identifier.ShortDebugString() |