From 3cb2ced48dec3b9ea60e008b2a3598a322458adf Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 23 Oct 2025 11:48:45 -0400 Subject: Fixed typos in the_advanced locations --- data/maps/the_advanced/doors.txtpb | 6 +++--- tools/validator/validator.cpp | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/data/maps/the_advanced/doors.txtpb b/data/maps/the_advanced/doors.txtpb index d1e420c..fbe7ab1 100644 --- a/data/maps/the_advanced/doors.txtpb +++ b/data/maps/the_advanced/doors.txtpb @@ -20,7 +20,7 @@ doors { panels { room: "Main Area" name: "DECK (1)" } panels { room: "Main Area" name: "DECK (2)" } panels { room: "Main Area" name: "DECK (3)" } - location_name: "Main Area" + location_room: "Main Area" } doors { name: "North Wall Puzzles" @@ -30,7 +30,7 @@ doors { panels { room: "Main Area" name: "REST" } panels { room: "Main Area" name: "THE" } panels { room: "Main Area" name: "LIVES" } - location_name: "Main Area" + location_room: "Main Area" } doors { name: "East Wall Puzzles" @@ -44,7 +44,7 @@ doors { panels { room: "Main Area" name: "FRUIT (1)" } panels { room: "Main Area" name: "FRUIT (2)" } panels { room: "Main Area" name: "FRUIT FRUIT" } - location_name: "Main Area" + location_room: "Main Area" } doors { name: "CBA Door" diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index d651e04..43d842d 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp @@ -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()); -- cgit 1.4.1