refactor: native_meeting_center_id building property moved from subtype

Author: dalerank

src/building/building.h

@@ -168,10 +168,9 @@ class building {
     e_building_type type;
     union {
         e_house_level house_level;
-        uint16_t data;
-        //        short workshop_type;
-        short native_meeting_center_id;        
+        uint16_t data;       
     } subtype;
+    short native_meeting_center_id;
     unsigned short road_network_id;
     //unsigned short creation_sequence_index;
     short houses_covered;

src/city/city_buildings.cpp

@@ -244,7 +244,7 @@ io_buffer *iob_buildings = new io_buffer([] (io_buffer *iob, size_t version) {
         iob->bind(BIND_SIGNATURE_UINT16, &b->type);
         iob->bind(BIND_SIGNATURE_INT16, &b->subtype.data); // which union field we use does not matter
         iob->bind(BIND_SIGNATURE_UINT16, &b->road_network_id);
-        iob->bind____skip(2); //iob->bind(BIND_SIGNATURE_UINT16, &b->creation_sequence_index);
+        iob->bind(BIND_SIGNATURE_INT16, &b->native_meeting_center_id);
         iob->bind(BIND_SIGNATURE_INT16, &b->houses_covered);
         iob->bind(BIND_SIGNATURE_INT16, &b->percentage_houses_covered);
 

src/figuretype/native.cpp

@@ -44,7 +44,7 @@ void figure::indigenous_native_action() {
             wait_ticks = 0;
             if (!g_city.military.is_native_attack_active()) {
                 int x_tile, y_tile;
-                building* meeting = building_get(b->subtype.native_meeting_center_id);
+                building* meeting = building_get(b->native_meeting_center_id);
                 if (map_terrain_get_adjacent_road_or_clear_land(
                       meeting->tile.x(), meeting->tile.y(), meeting->size, &x_tile, &y_tile)) {
                     action_state = FIGURE_ACTION_156_NATIVE_GOING_TO_MEETING_CENTER;

src/grid/natives.cpp

@@ -68,7 +68,7 @@ static void determine_meeting_center(void) {
                     min_meeting_id = meetings[n];
                 }
             }
-            b->subtype.native_meeting_center_id = min_meeting_id;
+            b->native_meeting_center_id = min_meeting_id;
         }
     }
 }