From c9da387ede51f207825b63d9f13036a7b661d4b3 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 7 Aug 2025 16:05:15 -0400 Subject: Started apworld vcpkg's libprotobuf is older than what PIP has, but neither are completely up to date either. Ugh. Doors have a room now because that's where the location will go. --- tools/datapacker/main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tools/datapacker/main.cpp') diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index e63f940..1dcd109 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp @@ -215,6 +215,14 @@ class DataPacker { container_.FindOrAddDoor(current_map_name, h_door.name(), std::nullopt); Door& door = *container_.all_objects().mutable_doors(door_id); + if (h_door.has_location_room()) { + door.set_room_id(container_.FindOrAddRoom( + current_map_name, h_door.location_room(), std::nullopt)); + + Room& room = *container_.all_objects().mutable_rooms(door.room_id()); + room.add_doors(door_id); + } + std::copy( h_door.receivers().begin(), h_door.receivers().end(), google::protobuf::RepeatedFieldBackInserter(door.mutable_receivers())); -- cgit 1.4.1