3 files changed, 14 insertions, 14 deletions

@@ -160,7 +160,7 @@ uint64_t Container::FindOrAddPanel(std::optional<std::string> map_name,
   auto it = room_container.find(panel_name);
   if (it == room_container.end()) {
     uint64_t new_id = all_objects_.panels_size();
-    Panel* panel = all_objects_.add_panels();
+    PanelData* panel = all_objects_.add_panels();
     panel->set_id(new_id);
     panel->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
     panel->set_name(panel_name);
@@ -173,8 +173,8 @@ uint64_t Container::FindOrAddPanel(std::optional<std::string> map_name,
   }
 }
 
-uint64_t Container::FindOrAddLetter(std::string key, bool double_) {
-  std::string letter_name = GetLetterName(key, double_);
+uint64_t Container::FindOrAddLetter(std::string key, bool level2) {
+  std::string letter_name = GetLetterName(key, level2);
 
   auto it = letter_id_by_name_.find(letter_name);
   if (it == letter_id_by_name_.end()) {
@@ -183,8 +183,8 @@ uint64_t Container::FindOrAddLetter(std::string key, bool double_) {
     letter->set_id(new_id);
     letter->set_key(key);
 
-    if (double_) {
-      letter->set_double_(double_);
+    if (level2) {
+      letter->set_level2(level2);
     }
 
     letter_id_by_name_[letter_name] = new_id;
@@ -36,7 +36,7 @@ class Container {
                           std::optional<std::string> map_fallback,
                           std::optional<std::string> room_fallback);
 
-  uint64_t FindOrAddLetter(std::string key, bool double_);
+  uint64_t FindOrAddLetter(std::string key, bool level2);
 
   uint64_t FindLetterByName(std::string letter_name);
 
@@ -122,7 +122,7 @@ class DataPacker {
     uint64_t panel_id =
         container_.FindOrAddPanel(current_map_name, current_room_name,
                                   h_panel.name(), std::nullopt, std::nullopt);
-    Panel& panel = *container_.all_objects().mutable_panels(panel_id);
+    PanelData& panel = *container_.all_objects().mutable_panels(panel_id);
 
     panel.set_path(h_panel.path());
     panel.set_clue(h_panel.clue());
@@ -169,9 +169,9 @@ class DataPacker {
     painting.set_display_name(h_painting.display_name());
     painting.set_orientation(h_painting.orientation());
 
-    if (h_painting.has_gravity()) {
-      painting.set_gravity(h_painting.gravity());
-    }
+    // Setting this explicitly because the Godot protobuf doesn't support
+    // custom defaults.
+    painting.set_gravity(h_painting.gravity());
 
     if (h_painting.has_move()) {
       painting.set_move(h_painting.move());
@@ -208,9 +208,9 @@ class DataPacker {
     port.set_path(h_port.path());
     port.set_orientation(h_port.orientation());
 
-    if (h_port.has_gravity()) {
-      port.set_gravity(h_port.gravity());
-    }
+    // Setting this explicitly because the Godot protobuf doesn't support
+    // custom defaults.
+    port.set_gravity(h_port.gravity());
 
     if (h_port.has_required_door()) {
       std::optional<std::string> map_name =
@@ -228,7 +228,7 @@ class DataPacker {
                          const std::string& current_map_name,
                          const std::string& current_room_name) {
     uint64_t letter_id =
-        container_.FindOrAddLetter(h_letter.key(), h_letter.double_());
+        container_.FindOrAddLetter(h_letter.key(), h_letter.level2());
     Letter& letter = *container_.all_objects().mutable_letters(letter_id);
 
     letter.set_room_id(container_.FindOrAddRoom(