diff options
Diffstat (limited to 'tools/datapacker/container.cpp')
| -rw-r--r-- | tools/datapacker/container.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
| diff --git a/tools/datapacker/container.cpp b/tools/datapacker/container.cpp index bb58ec5..ffcb75a 100644 --- a/tools/datapacker/container.cpp +++ b/tools/datapacker/container.cpp | |||
| @@ -160,7 +160,7 @@ uint64_t Container::FindOrAddPanel(std::optional<std::string> map_name, | |||
| 160 | auto it = room_container.find(panel_name); | 160 | auto it = room_container.find(panel_name); |
| 161 | if (it == room_container.end()) { | 161 | if (it == room_container.end()) { |
| 162 | uint64_t new_id = all_objects_.panels_size(); | 162 | uint64_t new_id = all_objects_.panels_size(); |
| 163 | Panel* panel = all_objects_.add_panels(); | 163 | PanelData* panel = all_objects_.add_panels(); |
| 164 | panel->set_id(new_id); | 164 | panel->set_id(new_id); |
| 165 | panel->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt)); | 165 | panel->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt)); |
| 166 | panel->set_name(panel_name); | 166 | panel->set_name(panel_name); |
| @@ -173,8 +173,8 @@ uint64_t Container::FindOrAddPanel(std::optional<std::string> map_name, | |||
| 173 | } | 173 | } |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | uint64_t Container::FindOrAddLetter(std::string key, bool double_) { | 176 | uint64_t Container::FindOrAddLetter(std::string key, bool level2) { |
| 177 | std::string letter_name = GetLetterName(key, double_); | 177 | std::string letter_name = GetLetterName(key, level2); |
| 178 | 178 | ||
| 179 | auto it = letter_id_by_name_.find(letter_name); | 179 | auto it = letter_id_by_name_.find(letter_name); |
| 180 | if (it == letter_id_by_name_.end()) { | 180 | if (it == letter_id_by_name_.end()) { |
| @@ -183,8 +183,8 @@ uint64_t Container::FindOrAddLetter(std::string key, bool double_) { | |||
| 183 | letter->set_id(new_id); | 183 | letter->set_id(new_id); |
| 184 | letter->set_key(key); | 184 | letter->set_key(key); |
| 185 | 185 | ||
| 186 | if (double_) { | 186 | if (level2) { |
| 187 | letter->set_double_(double_); | 187 | letter->set_level2(level2); |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | letter_id_by_name_[letter_name] = new_id; | 190 | letter_id_by_name_[letter_name] = new_id; |
