diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2025-08-27 23:22:04 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2025-08-27 23:22:04 -0400 |
| commit | 6789f3551ef228f7e4aff73fef96038fab0fb2e6 (patch) | |
| tree | 4bc26dce83309f6b0729672ad4f2220f327760e0 /tools | |
| parent | d78d166d5f07359f5fc0e7efc5d57802db21fcfb (diff) | |
| download | lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.tar.gz lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.tar.bz2 lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.zip | |
Renamed Painting and Keyholder protos
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/datapacker/container.cpp | 4 | ||||
| -rw-r--r-- | tools/datapacker/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
| diff --git a/tools/datapacker/container.cpp b/tools/datapacker/container.cpp index 0d3417e..2c68552 100644 --- a/tools/datapacker/container.cpp +++ b/tools/datapacker/container.cpp | |||
| @@ -79,7 +79,7 @@ uint64_t Container::FindOrAddPainting( | |||
| 79 | auto it = room_container.find(painting_name); | 79 | auto it = room_container.find(painting_name); |
| 80 | if (it == room_container.end()) { | 80 | if (it == room_container.end()) { |
| 81 | uint64_t new_id = all_objects_.paintings_size(); | 81 | uint64_t new_id = all_objects_.paintings_size(); |
| 82 | Painting* painting = all_objects_.add_paintings(); | 82 | PaintingData* painting = all_objects_.add_paintings(); |
| 83 | painting->set_id(new_id); | 83 | painting->set_id(new_id); |
| 84 | painting->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt)); | 84 | painting->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt)); |
| 85 | painting->set_name(painting_name); | 85 | painting->set_name(painting_name); |
| @@ -289,7 +289,7 @@ uint64_t Container::FindOrAddKeyholder( | |||
| 289 | auto it = room_container.find(keyholder_name); | 289 | auto it = room_container.find(keyholder_name); |
| 290 | if (it == room_container.end()) { | 290 | if (it == room_container.end()) { |
| 291 | uint64_t new_id = all_objects_.keyholders_size(); | 291 | uint64_t new_id = all_objects_.keyholders_size(); |
| 292 | Keyholder* keyholder = all_objects_.add_keyholders(); | 292 | KeyholderData* keyholder = all_objects_.add_keyholders(); |
| 293 | keyholder->set_id(new_id); | 293 | keyholder->set_id(new_id); |
| 294 | keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt)); | 294 | keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt)); |
| 295 | keyholder->set_name(keyholder_name); | 295 | keyholder->set_name(keyholder_name); |
| diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index d9fcbe2..d820360 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp | |||
| @@ -184,7 +184,7 @@ class DataPacker { | |||
| 184 | uint64_t painting_id = container_.FindOrAddPainting( | 184 | uint64_t painting_id = container_.FindOrAddPainting( |
| 185 | current_map_name, current_room_name, h_painting.name(), std::nullopt, | 185 | current_map_name, current_room_name, h_painting.name(), std::nullopt, |
| 186 | std::nullopt); | 186 | std::nullopt); |
| 187 | Painting& painting = | 187 | PaintingData& painting = |
| 188 | *container_.all_objects().mutable_paintings(painting_id); | 188 | *container_.all_objects().mutable_paintings(painting_id); |
| 189 | 189 | ||
| 190 | painting.set_path(h_painting.path()); | 190 | painting.set_path(h_painting.path()); |
| @@ -279,7 +279,7 @@ class DataPacker { | |||
| 279 | uint64_t keyholder_id = container_.FindOrAddKeyholder( | 279 | uint64_t keyholder_id = container_.FindOrAddKeyholder( |
| 280 | current_map_name, current_room_name, h_keyholder.name(), std::nullopt, | 280 | current_map_name, current_room_name, h_keyholder.name(), std::nullopt, |
| 281 | std::nullopt); | 281 | std::nullopt); |
| 282 | Keyholder& keyholder = | 282 | KeyholderData& keyholder = |
| 283 | *container_.all_objects().mutable_keyholders(keyholder_id); | 283 | *container_.all_objects().mutable_keyholders(keyholder_id); |
| 284 | 284 | ||
| 285 | keyholder.set_path(h_keyholder.path()); | 285 | keyholder.set_path(h_keyholder.path()); |