Remove include of "bionics.h" from "character.h".

Changes `Character::my_bionics` to be a `copyable_uniqe_ptr<bionic_collection>`.

`bionic_collection` is a simple wrapper for `std::vector<bionic>`, defined in "bionics.h".
It can be forward declared, without defining the `bionic` class, `std::vector<bionic>` can't be forward declared without defining the `bionic` class.

Moves the definition of the destructor of `Character` into the cpp file because it implicitly requires the destructor of `bionics_collection` to be visible.

src/bionics.cpp

@@ -132,7 +132,7 @@ void force_comedown( effect &eff )
 // share functions....
 bool player::activate_bionic( int b, bool eff_only )
 {
-    bionic &bio = my_bionics[b];
+    bionic &bio = ( *my_bionics )[b];
 
     // Preserve the fake weapon used to initiate bionic gun firing
     static item bio_gun( weapon );
@@ -191,14 +191,14 @@ bool player::activate_bionic( int b, bool eff_only )
         weapon = item( bionics[bio.id].fake_item );
         weapon.invlet = '#';
     } else if( bio.id == "bio_ears" && has_active_bionic( bionic_id( "bio_earplugs" ) ) ) {
-        for( auto &i : my_bionics ) {
+        for( auto &i : *my_bionics ) {
             if( i.id == "bio_earplugs" ) {
                 i.powered = false;
                 add_msg( m_info, _( "Your %s automatically turn off." ), bionics[i.id].name.c_str() );
             }
         }
     } else if( bio.id == "bio_earplugs" && has_active_bionic( bionic_id( "bio_ears" ) ) ) {
-        for( auto &i : my_bionics ) {
+        for( auto &i : *my_bionics ) {
             if( i.id == "bio_ears" ) {
                 i.powered = false;
                 add_msg( m_info, _( "Your %s automatically turns off." ), bionics[i.id].name.c_str() );
@@ -554,7 +554,7 @@ bool player::activate_bionic( int b, bool eff_only )
 
 bool player::deactivate_bionic( int b, bool eff_only )
 {
-    bionic &bio = my_bionics[b];
+    bionic &bio = ( *my_bionics )[b];
 
     // Just do the effect, no stat changing or messages
     if( !eff_only ) {
@@ -659,7 +659,7 @@ bool attempt_recharge( player &p, bionic &bio, int &amount, int factor = 1, int
 
 void player::process_bionic( int b )
 {
-    bionic &bio = my_bionics[b];
+    bionic &bio = ( *my_bionics )[b];
     // Only powered bionics should be processed
     if( !bio.powered ) {
         return;
@@ -895,8 +895,8 @@ bool player::uninstall_bionic( bionic_id const &b_id, int skill_level )
 
     // Surgery is imminent, retract claws or blade if active
     if( skill_level == -1 ) {
-        for( size_t i = 0; i < my_bionics.size(); i++ ) {
-            const auto &bio = my_bionics[ i ];
+        for( size_t i = 0; i < my_bionics->size(); i++ ) {
+            const auto &bio = ( *my_bionics )[ i ];
             if( bio.powered && bio.info().weapon_bionic ) {
                 deactivate_bionic( i );
             }
@@ -1243,7 +1243,7 @@ std::string list_occupied_bps( const bionic_id &bio_id, const std::string &intro
 int player::get_used_bionics_slots( const body_part bp ) const
 {
     int used_slots = 0;
-    for( auto &bio : my_bionics ) {
+    for( auto &bio : *my_bionics ) {
         auto search = bionics[bio.id].occupied_bodyparts.find( bp );
         if( search != bionics[bio.id].occupied_bodyparts.end() ) {
             used_slots += search->second;
@@ -1326,9 +1326,9 @@ void player::add_bionic( bionic_id const &b )
         return;
     }
 
-    my_bionics.push_back( bionic( b, get_free_invlet( *this ) ) );
+    my_bionics->push_back( bionic( b, get_free_invlet( *this ) ) );
     if( b == "bio_tools" || b == "bio_ears" ) {
-        activate_bionic( my_bionics.size() - 1 );
+        activate_bionic( my_bionics->size() - 1 );
     }
 
     for( const auto &inc_bid : bionics[b].included_bionics ) {
@@ -1340,8 +1340,8 @@ void player::add_bionic( bionic_id const &b )
 
 void player::remove_bionic( bionic_id const &b )
 {
-    std::vector<bionic> new_my_bionics;
-    for( auto &i : my_bionics ) {
+    bionic_collection new_my_bionics;
+    for( auto &i : *my_bionics ) {
         if( b == i.id ) {
             continue;
         }
@@ -1353,21 +1353,21 @@ void player::remove_bionic( bionic_id const &b )
 
         new_my_bionics.push_back( bionic( i.id, i.invlet ) );
     }
-    my_bionics = new_my_bionics;
+    *my_bionics = new_my_bionics;
     recalc_sight_limits();
 }
 
 int player::num_bionics() const
 {
-    return my_bionics.size();
+    return my_bionics->size();
 }
 
 std::pair<int, int> player::amount_of_storage_bionics() const
 {
     int lvl = max_power_level;
 
     // exclude amount of power capacity obtained via non-power-storage CBMs
-    for( auto it : my_bionics ) {
+    for( auto it : *my_bionics ) {
         lvl -= bionics[it.id].capacity;
     }
 
@@ -1397,7 +1397,7 @@ std::pair<int, int> player::amount_of_storage_bionics() const
 
 bionic &player::bionic_at_index( int i )
 {
-    return my_bionics[i];
+    return ( *my_bionics )[i];
 }
 
 
@@ -1408,7 +1408,7 @@ bool player::remove_random_bionic()
     const int numb = num_bionics();
     if( numb ) {
         int rem = rng( 0, num_bionics() - 1 );
-        const auto bionic = my_bionics[rem];
+        const auto bionic = ( *my_bionics )[rem];
         remove_bionic( bionic.id );
         add_msg( m_bad, _( "Your %s fails, and is destroyed!" ), bionics[ bionic.id ].name.c_str() );
         recalc_sight_limits();

src/bionics.h

@@ -103,6 +103,12 @@ struct bionic : public JsonSerializer, public JsonDeserializer {
     void deserialize( JsonIn &jsin ) override;
 };
 
+// A simpler wrapper to allow forward declarations of it. std::vector can not
+// be forward declared without a *definition* of bionic, but this wrapper can.
+class bionic_collection : public std::vector<bionic>
+{
+};
+
 void check_bionics();
 void reset_bionics();
 void load_bionic( JsonObject &jsobj ); // load a bionic from JSON

src/bionics_ui.cpp

@@ -32,7 +32,7 @@ enum bionic_menu_mode {
 
 bionic *player::bionic_by_invlet( const long ch )
 {
-    for( auto &elem : my_bionics ) {
+    for( auto &elem : *my_bionics ) {
         if( elem.invlet == ch ) {
             return &elem;
         }
@@ -276,7 +276,7 @@ nc_color get_bionic_text_color( bionic const &bio, bool const isHighlightedBioni
     return type;
 }
 
-std::vector< bionic *>filtered_bionics( std::vector<bionic> &all_bionics, bionic_tab_mode mode )
+std::vector< bionic *>filtered_bionics( bionic_collection &all_bionics, bionic_tab_mode mode )
 {
     std::vector< bionic *>filtered_entries;
     for( auto &elem : all_bionics ) {
@@ -289,8 +289,8 @@ std::vector< bionic *>filtered_bionics( std::vector<bionic> &all_bionics, bionic
 
 void player::power_bionics()
 {
-    std::vector <bionic *> passive = filtered_bionics( my_bionics, TAB_PASSIVE );
-    std::vector <bionic *> active = filtered_bionics( my_bionics, TAB_ACTIVE );
+    std::vector <bionic *> passive = filtered_bionics( *my_bionics, TAB_PASSIVE );
+    std::vector <bionic *> active = filtered_bionics( *my_bionics, TAB_ACTIVE );
     bionic *bio_last = NULL;
     bionic_tab_mode tab_mode = TAB_ACTIVE;
 
@@ -310,7 +310,7 @@ void player::power_bionics()
     const int HEIGHT = std::min( TERMY,
                                  std::max( FULL_SCREEN_HEIGHT,
                                            TITLE_HEIGHT + TITLE_TAB_HEIGHT +
-                                           ( int )my_bionics.size() + 2 ) );
+                                           ( int )my_bionics->size() + 2 ) );
     const int WIDTH = FULL_SCREEN_WIDTH + ( TERMX - FULL_SCREEN_WIDTH ) / 2;
     const int START_X = ( TERMX - WIDTH ) / 2;
     const int START_Y = ( TERMY - HEIGHT ) / 2;
@@ -368,8 +368,8 @@ void player::power_bionics()
 
     for( ;; ) {
         if( recalc ) {
-            passive = filtered_bionics( my_bionics, TAB_PASSIVE );
-            active = filtered_bionics( my_bionics, TAB_ACTIVE );
+            passive = filtered_bionics( *my_bionics, TAB_PASSIVE );
+            active = filtered_bionics( *my_bionics, TAB_ACTIVE );
 
             if( active.empty() && !passive.empty() ) {
                 tab_mode = TAB_PASSIVE;
@@ -590,7 +590,7 @@ void player::power_bionics()
             }
             if( menu_mode == ACTIVATING ) {
                 if( bio_data.activated ) {
-                    int b = tmp - &my_bionics[0];
+                    int b = tmp - &( *my_bionics )[0];
                     if( tmp->powered ) {
                         deactivate_bionic( b );
                     } else {

src/character.cpp

@@ -1,6 +1,7 @@
 #include "character.h"
 #include "game.h"
 #include "map.h"
+#include "bionics.h"
 #include "map_selector.h"
 #include "vehicle_selector.h"
 #include "debug.h"
@@ -132,6 +133,8 @@ Character::Character() : Creature(), visitable<Character>()
     path_settings = pathfinding_settings{ 0, 1000, 1000, 0, true, false, true };
 }
 
+Character::~Character() = default;
+
 field_id Character::bloodType() const
 {
     if (has_trait( trait_ACIDBLOOD ))
@@ -614,7 +617,7 @@ float Character::get_vision_threshold( float light_level ) const {
 
 bool Character::has_bionic(const bionic_id &b) const
 {
-    for (auto &i : my_bionics) {
+    for (auto &i : *my_bionics) {
         if (i.id == b) {
             return true;
         }
@@ -624,7 +627,7 @@ bool Character::has_bionic(const bionic_id &b) const
 
 bool Character::has_active_bionic(const bionic_id &b) const
 {
-    for (auto &i : my_bionics) {
+    for (auto &i : *my_bionics) {
         if (i.id == b) {
             return (i.powered);
         }

src/character.h

@@ -5,7 +5,7 @@
 #include "visitable.h"
 #include "creature.h"
 #include "inventory.h"
-#include "bionics.h"
+#include "copyable_unique_ptr.h"
 #include "skill.h"
 #include "map_selector.h"
 #include "pathfinding.h"
@@ -20,6 +20,9 @@ class field_entry;
 class vehicle;
 struct resistances;
 struct mutation_branch;
+class bionic_collection;
+struct bionic_data;
+using bionic_id = string_id<bionic_data>;
 
 enum vision_modes {
     DEBUG_NIGHTVISION,
@@ -71,7 +74,7 @@ struct aim_type {
 class Character : public Creature, public visitable<Character>
 {
     public:
-        ~Character() override { };
+        ~Character() override;
 
         field_id bloodType() const override;
         field_id gibType() const override;
@@ -602,7 +605,7 @@ class Character : public Creature, public visitable<Character>
         item weapon;
         item ret_null; // Null item, sometimes returns by weapon() etc
 
-        std::vector<bionic> my_bionics;
+        copyable_unique_ptr<bionic_collection> my_bionics;
 
     protected:
         void on_stat_change( const std::string &, int ) override {};

src/crafting.cpp

@@ -6,6 +6,7 @@
 #include "game.h"
 #include "game_inventory.h"
 #include "input.h"
+#include "bionics.h"
 #include "inventory.h"
 #include "itype.h"
 #include "json.h"
@@ -285,7 +286,7 @@ const inventory &player::crafting_inventory()
     cached_crafting_inventory += inv;
     cached_crafting_inventory += weapon;
     cached_crafting_inventory += worn;
-    for( const auto &bio : my_bionics ) {
+    for( const auto &bio : *my_bionics ) {
         const auto &bio_data = bio.info();
         if( ( !bio_data.activated || bio.powered ) &&
             !bio_data.fake_item.empty() ) {

src/game.cpp

@@ -11,6 +11,7 @@
 #include "veh_type.h"
 #include "options.h"
 #include "auto_pickup.h"
+#include "bionics.h"
 #include "gamemode.h"
 #include "mapbuffer.h"
 #include "map_item_stack.h"

src/mission_companion.cpp

@@ -5,6 +5,7 @@
 #include "dialogue.h"
 #include "rng.h"
 #include "line.h"
+#include "bionics.h"
 #include "debug.h"
 #include "catacharset.h"
 #include "messages.h"
@@ -101,7 +102,7 @@ void talk_function::bionic_install(npc &p)
 
 void talk_function::bionic_remove(npc &p)
 {
-    std::vector <bionic> all_bio = g->u.my_bionics;
+    bionic_collection all_bio = *g->u.my_bionics;
     if (all_bio.size() == 0){
         popup(_("You don't have any bionics installed..."));
         return;

src/newcharacter.cpp

@@ -6,6 +6,7 @@
 #include "start_location.h"
 #include "input.h"
 #include "output.h"
+#include "bionics.h"
 #include "rng.h"
 #include "game.h"
 #include "name.h"

src/player.cpp

@@ -2416,8 +2416,8 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph )
     //Bionics
     memorial_file << _( "Bionics:" ) << eol;
     int total_bionics = 0;
-    for( size_t i = 0; i < my_bionics.size(); ++i ) {
-        memorial_file << indent << ( i + 1 ) << ": " << my_bionics[i].id->name << eol;
+    for( size_t i = 0; i < my_bionics->size(); ++i ) {
+        memorial_file << indent << ( i + 1 ) << ": " << (*my_bionics)[i].id->name << eol;
         total_bionics++;
     }
     if( total_bionics == 0 ) {
@@ -5390,8 +5390,8 @@ void player::suffer()
         }
     }
 
-    for (size_t i = 0; i < my_bionics.size(); i++) {
-        if (my_bionics[i].powered) {
+    for (size_t i = 0; i < my_bionics->size(); i++) {
+        if ((*my_bionics)[i].powered) {
             process_bionic(i);
         }
     }
@@ -6755,7 +6755,7 @@ int player::invlet_to_position( const long linvlet ) const
 }
 
 bool player::can_interface_armor() const {
-    bool okay = std::any_of( my_bionics.begin(), my_bionics.end(),
+    bool okay = std::any_of( my_bionics->begin(), my_bionics->end(),
         []( const bionic &b ) { return b.powered && b.info().armor_interface; } );
     return okay;
 }
@@ -11371,7 +11371,7 @@ void player::place_corpse()
     for( auto itm : tmp ) {
         g->m.add_item_or_charges( pos(), *itm );
     }
-    for( auto & bio : my_bionics ) {
+    for( auto & bio : *my_bionics ) {
         if( item::type_is_defined( bio.id.str() ) ) {
             body.put_in( item( bio.id.str(), calendar::turn ) );
         }

src/player.h

@@ -20,7 +20,7 @@
 static const std::string DEFAULT_HOTKEYS("1234567890abcdefghijklmnopqrstuvwxyz");
 
 enum action_id : int;
-
+struct bionic;
 class dispersion_sources;
 class monster;
 class game;

src/savegame_json.cpp

@@ -315,7 +315,7 @@ void Character::load(JsonObject &data)
         }
     }
 
-    data.read( "my_bionics", my_bionics );
+    data.read( "my_bionics", *my_bionics );
 
     for( auto &w : worn ) {
         w.on_takeoff( *this );
@@ -406,7 +406,7 @@ void Character::store(JsonOut &json) const
     json.member( "mutations", my_mutations );
 
     // "Fracking Toasters" - Saul Tigh, toaster
-    json.member( "my_bionics", my_bionics );
+    json.member( "my_bionics", *my_bionics );
 
     // skills
     json.member( "skills" );