4 files changed, 3 insertions, 16 deletions

@@ -411,8 +411,8 @@ class DataPacker {
           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_white_ending()) {
+      door.set_white_ending(h_door.white_ending());
     }
 
     if (h_door.has_control_center_color()) {
@@ -373,11 +373,6 @@ 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,
@@ -107,8 +107,6 @@ struct LetterInfo {
 struct EndingInfo {
   std::vector<RoomIdentifier> defined_in;
   bool has_id = false;
-
-  std::vector<DoorIdentifier> doors_referenced_by;
 };
 
 struct PanelNameInfo {
@@ -111,7 +111,7 @@ class Validator {
       return false;
     }
 
-    if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0 ||
+    if (h_door.keyholders_size() > 0 || h_door.white_ending() ||
         h_door.complete_at() > 0) {
       return true;
     }
@@ -488,12 +488,6 @@ class Validator {
       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;
-      }
-
       if (ending_info.has_id) {
         std::cout << "    An AP ID is present." << std::endl;
       }