1 files changed, 13 insertions, 7 deletions

@@ -225,13 +225,19 @@ class Validator {
                   << " needs an explicit location name." << std::endl;
       }
 
-      if (h_door.double_letters() &&
-          (h_door.type() == DoorType::STANDARD ||
-           h_door.type() == DoorType::LOCATION_ONLY ||
-           h_door.type() == DoorType::GRAVESTONE)) {
-        std::cout << "Door " << door_identifier.ShortDebugString()
-                  << " is a location that depends on double_letters."
-                  << std::endl;
+      if (h_door.type() == DoorType::STANDARD ||
+          h_door.type() == DoorType::LOCATION_ONLY ||
+          h_door.type() == DoorType::GRAVESTONE) {
+        if (h_door.double_letters()) {
+          std::cout << "Door " << door_identifier.ShortDebugString()
+                    << " is a location that depends on double_letters."
+                    << std::endl;
+        }
+
+        if (!h_door.has_location_room()) {
+          std::cout << "Door " << door_identifier.ShortDebugString()
+                    << " is missing a location_room." << std::endl;
+        }
       }
 
       bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch());