summary refs log tree commit diff stats
path: root/tools/datapacker
diff options
context:
space:
mode:
Diffstat (limited to 'tools/datapacker')
-rw-r--r--tools/datapacker/main.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index d820360..cc83ca1 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp
@@ -104,7 +104,11 @@ class DataPacker {
104 container_.FindOrAddRoom(current_map_name, h_room.name(), std::nullopt); 104 container_.FindOrAddRoom(current_map_name, h_room.name(), std::nullopt);
105 Room& room = *container_.all_objects().mutable_rooms(room_id); 105 Room& room = *container_.all_objects().mutable_rooms(room_id);
106 106
107 room.set_display_name(h_room.display_name()); 107 //room.set_display_name(h_room.display_name());
108
109 if (h_room.has_panel_display_name()) {
110 room.set_panel_display_name(h_room.panel_display_name());
111 }
108 112
109 for (const HumanPanel& h_panel : h_room.panels()) { 113 for (const HumanPanel& h_panel : h_room.panels()) {
110 room.add_panels(ProcessPanel(h_panel, current_map_name, room.name())); 114 room.add_panels(ProcessPanel(h_panel, current_map_name, room.name()));
@@ -175,6 +179,10 @@ class DataPacker {
175 map_name, h_panel.required_room().name(), current_map_name)); 179 map_name, h_panel.required_room().name(), current_map_name));
176 } 180 }
177 181
182 if (h_panel.has_display_name()) {
183 panel.set_display_name(h_panel.display_name());
184 }
185
178 return panel_id; 186 return panel_id;
179 } 187 }
180 188
@@ -394,6 +402,10 @@ class DataPacker {
394 } 402 }
395 403
396 door.set_type(h_door.type()); 404 door.set_type(h_door.type());
405
406 if (h_door.has_location_name()) {
407 door.set_location_name(h_door.location_name());
408 }
397 } 409 }
398 410
399 void ProcessConnectionsFile(std::filesystem::path path, 411 void ProcessConnectionsFile(std::filesystem::path path,