4 files changed, 21 insertions, 1 deletions

@@ -380,6 +380,10 @@ class DataPacker {
       door.add_doors(
           container_.FindOrAddDoor(map_name, di.name(), current_map_name));
     }
+    
+    for (const std::string& ending_name : h_door.endings()) {
+      door.add_endings(container_.FindOrAddEnding(ending_name));
+    }
 
     if (h_door.has_control_center_color()) {
       door.set_control_center_color(h_door.control_center_color());
@@ -337,6 +337,11 @@ class HumanProcessor {
       DoorInfo& other_door_info = info_.doors[complete_door_identifier];
       other_door_info.doors_referenced_by.push_back(door_identifier);
     }
+
+    for (const std::string& ei : h_door.endings()) {
+      EndingInfo& ending_info = info_.endings[ei];
+      ending_info.doors_referenced_by.push_back(door_identifier);
+    }
   }
 
   void ProcessConnectionsFile(std::filesystem::path path,
@@ -92,6 +92,8 @@ struct LetterInfo {
 
 struct EndingInfo {
   std::vector<RoomIdentifier> defined_in;
+
+  std::vector<DoorIdentifier> doors_referenced_by;
 };
 
 struct CollectedInfo {
@@ -245,7 +245,16 @@ void ValidateLetter(const LetterIdentifier& letter_identifier,
 
 void ValidateEnding(const std::string& ending_name,
                     const EndingInfo& ending_info) {
-  if (ending_info.defined_in.size() > 1) {
+  if (ending_info.defined_in.empty()) {
+    std::cout << "Ending " << ending_name
+              << " has no definition, but was referenced:" << std::endl;
+
+    for (const DoorIdentifier& door_identifier :
+         ending_info.doors_referenced_by) {
+      std::cout << "    DOOR " << door_identifier.ShortDebugString()
+                << std::endl;
+    }
+  } else if (ending_info.defined_in.size() > 1) {
     std::cout << "Ending " << ending_name
               << " was defined in multiple places:" << std::endl;