building: correct save wharf orientation

Author: dalerank

src/building/building.cpp

@@ -1189,11 +1189,9 @@ static void read_type_data(io_buffer *iob, building *b, size_t version) {
         iob->bind____skip(26);
         iob->bind____skip(57);
         iob->bind(BIND_SIGNATURE_UINT8, &data.farm.worker_frame);
-    } else {
+    } else if (building_is_entertainment(b->type)) {
         iob->bind____skip(26);
-        iob->bind____skip(56);
-        iob->bind(BIND_SIGNATURE_UINT8, &data.guild.max_workers);
-        iob->bind____skip(1);
+        iob->bind____skip(58);
         iob->bind(BIND_SIGNATURE_UINT8, &data.entertainment.num_shows);
         iob->bind(BIND_SIGNATURE_UINT8, &data.entertainment.juggler_visited);
         iob->bind(BIND_SIGNATURE_UINT8, &data.entertainment.musician_visited);
@@ -1208,6 +1206,12 @@ static void read_type_data(io_buffer *iob, building *b, size_t version) {
         iob->bind(BIND_SIGNATURE_UINT8, &data.entertainment.consume_material_id);
         iob->bind(BIND_SIGNATURE_UINT8, &data.entertainment.spawned_entertainer_days);
         iob->bind(BIND_SIGNATURE_UINT32, &data.entertainment.booth_corner_grid_offset);
+    } else if (b->type == BUILDING_WARSHIP_WHARF) {
+        iob->bind(BIND_SIGNATURE_UINT8, &data.wharf.orientation);
+    } else {
+        iob->bind____skip(26);
+        iob->bind____skip(56);
+        iob->bind(BIND_SIGNATURE_UINT8, &data.guild.max_workers);
     }
 }
 
@@ -1273,9 +1277,10 @@ io_buffer* iob_buildings = new io_buffer([](io_buffer* iob, size_t version) {
         iob->bind(BIND_SIGNATURE_UINT8, &b->health_proof);
         iob->bind(BIND_SIGNATURE_INT16, &b->formation_id); 
 
-        read_type_data(iob, b, version); // 42 bytes for C3, 102 for PH
+        read_type_data(iob, b, version); // 102 for PH
 
         int currind = iob->get_offset() - sind;
+        assert(currind > 0);
         iob->bind____skip(184 - currind);
 
         iob->bind(BIND_SIGNATURE_INT32, &b->tax_income_or_storage);

src/building/building.h

@@ -247,6 +247,11 @@ class building {
             unsigned short work_camp_id;
             unsigned char worker_id;
         } industry;
+
+        struct  {
+            uint8_t orientation;
+        } wharf;
+
         struct entertainment_t {
             uint8_t spawned_entertainer_days;
             uint8_t num_shows;

src/building/building_warship_wharf.cpp

@@ -11,7 +11,7 @@ void building_warship_wharf::static_params::load(archive arch) {
 }
 
 void building_warship_wharf::on_create(int orientation) {
-    data.industry.orientation = orientation;
+    data.wharf.orientation = orientation;
 }
 
 void building_warship_wharf::on_place(int orientation, int variant) {
@@ -27,7 +27,7 @@ void building_warship_wharf::on_place_update_tiles(int orientation, int variant)
 }
 
 void building_warship_wharf::update_map_orientation(int orientation) {
-    int image_offset = city_view_relative_orientation(data.industry.orientation);
+    int image_offset = city_view_relative_orientation(data.wharf.orientation);
     int image_id = anim(animkeys().base).first_img() + image_offset;
     map_water_add_building(id(), tile(), size(), image_id);
 }

src/building/building_wharf.cpp

@@ -4,10 +4,14 @@
 #include "city/labor.h"
 #include "grid/water.h"
 
-buildings::model_t<building_transport_wharf> transport_wharf_m;
+building_transport_wharf::static_params transport_wharf_m;
+
+void building_transport_wharf::static_params::load(archive arch) {
+
+}
 
 void building_wharf::on_create(int orientation) {
-    data.industry.orientation = orientation;
+    data.wharf.orientation = orientation;
 }
 
 void building_wharf::on_place_update_tiles(int orientation, int variant) {

src/building/building_wharf.h

@@ -16,5 +16,11 @@ class building_transport_wharf : public building_wharf {
 public:
     BUILDING_METAINFO(BUILDING_TRANSPORT_WHARF, building_transport_wharf)
     building_transport_wharf(building &b) : building_wharf(b) {}
+
+    struct static_params : public buildings::model_t<building_transport_wharf> {
+        virtual void load(archive arch) override;
+    };
+
+    static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };