diff options
Diffstat (limited to 'tools/datapacker/main.cpp')
-rw-r--r-- | tools/datapacker/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 860d3c0..0beb304 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp | |||
@@ -14,6 +14,7 @@ | |||
14 | #include "container.h" | 14 | #include "container.h" |
15 | #include "proto/data.pb.h" | 15 | #include "proto/data.pb.h" |
16 | #include "proto/human.pb.h" | 16 | #include "proto/human.pb.h" |
17 | #include "util/ids_yaml_format.h" | ||
17 | 18 | ||
18 | namespace com::fourisland::lingo2_archipelago { | 19 | namespace com::fourisland::lingo2_archipelago { |
19 | namespace { | 20 | namespace { |
@@ -42,7 +43,7 @@ class DataPacker { | |||
42 | 43 | ||
43 | ProcessConnectionsFile(datadir_path / "connections.txtpb", std::nullopt); | 44 | ProcessConnectionsFile(datadir_path / "connections.txtpb", std::nullopt); |
44 | ProcessMaps(datadir_path); | 45 | ProcessMaps(datadir_path); |
45 | ProcessIdsFile(datadir_path / "ids.txtpb"); | 46 | ProcessIdsFile(datadir_path / "ids.yaml"); |
46 | 47 | ||
47 | { | 48 | { |
48 | std::ofstream outputfile(outputpath_); | 49 | std::ofstream outputfile(outputpath_); |
@@ -490,7 +491,7 @@ class DataPacker { | |||
490 | } | 491 | } |
491 | 492 | ||
492 | void ProcessIdsFile(std::filesystem::path path) { | 493 | void ProcessIdsFile(std::filesystem::path path) { |
493 | auto ids = ReadMessageFromFile<IdMappings>(path.string()); | 494 | auto ids = ReadIdsFromYaml(path.string()); |
494 | 495 | ||
495 | for (const auto& [map_name, map] : ids.maps()) { | 496 | for (const auto& [map_name, map] : ids.maps()) { |
496 | for (const auto& [door_name, ap_id] : map.doors()) { | 497 | for (const auto& [door_name, ap_id] : map.doors()) { |