Skip to content

Commit

Permalink
Replace my_bionics with get_bionics() where possible and various code…
Browse files Browse the repository at this point in the history 
… cleaning (#36846)
  • Loading branch information
@Fris0uman @ZhilkinSerg
Fris0uman authored and ZhilkinSerg committed Jan 10, 2020
1 parent eae8c07 commit bcd1812
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 135 deletions.
162 changes: 81 additions & 81 deletions src/bionics.cpp
View file

Large diffs are not rendered by default.

72 changes: 36 additions & 36 deletions src/character.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ void Character::add_effect( const efftype_id &eff_id, const time_duration dur, b

void Character::process_turn()
{
for( auto &i : *my_bionics ) {
for( bionic &i : *my_bionics ) {
if( i.incapacitated_time > 0_turns ) {
i.incapacitated_time -= 1_turns;
if( i.incapacitated_time == 0_turns ) {
Expand Down Expand Up @@ -1292,8 +1292,8 @@ std::vector<bionic_id> Character::get_bionics() const

bool Character::has_bionic( const bionic_id &b ) const
{
for( auto &i : *my_bionics ) {
if( i.id == b ) {
for( const bionic_id bid : get_bionics() ) {
if( bid == b ) {
return true;
}
}
Expand All @@ -1302,7 +1302,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( const bionic &i : *my_bionics ) {
if( i.id == b ) {
return ( i.powered && i.incapacitated_time == 0_turns );
}
Expand All @@ -1312,7 +1312,7 @@ bool Character::has_active_bionic( const bionic_id &b ) const

bool Character::has_any_bionic() const
{
return !my_bionics->empty();
return !get_bionics().empty();
}

bool Character::can_fuel_bionic_with( const item &it ) const
Expand All @@ -1321,8 +1321,8 @@ bool Character::can_fuel_bionic_with( const item &it ) const
return false;
}

for( const auto bio : *my_bionics ) {
for( const itype_id fuel : bio.info().fuel_opts ) {
for( const bionic_id bid : get_bionics() ) {
for( const itype_id fuel : bid->fuel_opts ) {
if( fuel == it.typeId() ) {
return true;
}
Expand All @@ -1335,10 +1335,10 @@ std::vector<bionic_id> Character::get_bionic_fueled_with( const item &it ) const
{
std::vector<bionic_id> bionics;

for( const bionic bio : *my_bionics ) {
for( const itype_id fuel : bio.info().fuel_opts ) {
for( const bionic_id bid : get_bionics() ) {
for( const itype_id fuel : bid->fuel_opts ) {
if( fuel == it.typeId() ) {
bionics.emplace_back( bio.id );
bionics.emplace_back( bid );
}
}
}
Expand All @@ -1349,9 +1349,9 @@ std::vector<bionic_id> Character::get_bionic_fueled_with( const item &it ) const
std::vector<bionic_id> Character::get_fueled_bionics() const
{
std::vector<bionic_id> bionics;
for( const bionic bio : *my_bionics ) {
if( !bio.info().fuel_opts.empty() ) {
bionics.emplace_back( bio.id );
for( const bionic_id bid : get_bionics() ) {
if( !bid->fuel_opts.empty() ) {
bionics.emplace_back( bid );
}
}
return bionics;
Expand Down Expand Up @@ -1449,11 +1449,11 @@ int Character::get_fuel_capacity( const itype_id fuel ) const
amount_stored = std::stoi( get_value( fuel ) );
}
int capacity = 0;
for( const bionic &bio : *my_bionics ) {
for( const itype_id &fl : bio.info().fuel_opts ) {
if( get_value( bio.id.c_str() ).empty() || get_value( bio.id.c_str() ) == fl ) {
for( const bionic_id bid : get_bionics() ) {
for( const itype_id &fl : bid->fuel_opts ) {
if( get_value( bid.c_str() ).empty() || get_value( bid.c_str() ) == fl ) {
if( fl == fuel ) {
capacity += bio.info().fuel_capacity;
capacity += bid->fuel_capacity;
}
}
}
Expand All @@ -1464,11 +1464,11 @@ int Character::get_fuel_capacity( const itype_id fuel ) const
int Character::get_total_fuel_capacity( const itype_id fuel ) const
{
int capacity = 0;
for( const bionic &bio : *my_bionics ) {
for( const itype_id &fl : bio.info().fuel_opts ) {
if( get_value( bio.id.c_str() ).empty() || get_value( bio.id.c_str() ) == fl ) {
for( const bionic_id bid : get_bionics() ) {
for( const itype_id &fl : bid->fuel_opts ) {
if( get_value( bid.c_str() ).empty() || get_value( bid.c_str() ) == fl ) {
if( fl == fuel ) {
capacity += bio.info().fuel_capacity;
capacity += bid->fuel_capacity;
}
}
}
Expand Down Expand Up @@ -1523,9 +1523,9 @@ void Character::update_fuel_storage( const itype_id &fuel )
int Character::get_mod_stat_from_bionic( const Character::stat &Stat ) const
{
int ret = 0;
for( const bionic &bio : *my_bionics ) {
const auto St_bn = bio.info().stat_bonus.find( Stat );
if( St_bn != bio.info().stat_bonus.end() ) {
for( const bionic_id bid : get_bionics() ) {
const auto St_bn = bid->stat_bonus.find( Stat );
if( St_bn != bid->stat_bonus.end() ) {
ret += St_bn->second;
}
}
Expand Down Expand Up @@ -2082,9 +2082,9 @@ units::mass Character::weight_capacity() const
}

units::mass bio_weight_bonus = 0_gram;
for( const bionic &bio : *my_bionics ) {
ret *= bio.info().weight_capacity_modifier;
bio_weight_bonus += bio.info().weight_capacity_bonus;
for( const bionic_id bid : get_bionics() ) {
ret *= bid->weight_capacity_modifier;
bio_weight_bonus += bid->weight_capacity_bonus;
}

ret += bio_weight_bonus + worn_weight_bonus ;
Expand Down Expand Up @@ -2941,8 +2941,8 @@ static void apply_mut_encumbrance( std::array<encumbrance_data, num_bp> &vals,
void Character::mut_cbm_encumb( std::array<encumbrance_data, num_bp> &vals ) const
{

for( const bionic &bio : *my_bionics ) {
for( const auto &element : bio.info().encumbrance ) {
for( const bionic_id bid : get_bionics() ) {
for( const std::pair<body_part, int> &element : bid->encumbrance ) {
vals[element.first].encumbrance += element.second;
}
}
Expand Down Expand Up @@ -3441,7 +3441,7 @@ void Character::on_damage_of_type( int adjusted_damage, damage_type type, body_p
// Electrical damage has a chance to temporarily incapacitate bionics in the damaged body_part.
if( type == DT_ELECTRIC ) {
const time_duration min_disable_time = 10_turns * adjusted_damage;
for( auto &i : *my_bionics ) {
for( bionic &i : *my_bionics ) {
if( !i.powered ) {
// Unpowered bionics are protected from power surges.
continue;
Expand Down Expand Up @@ -5212,9 +5212,9 @@ units::mass Character::bodyweight() const
units::mass Character::bionics_weight() const
{
units::mass bio_weight = 0_gram;
for( const auto bio : *my_bionics ) {
if( !bio.info().included ) {
bio_weight += item::find_type( bio.id.c_str() )->weight;
for( const bionic_id bid : get_bionics() ) {
if( !bid->included ) {
bio_weight += item::find_type( bid.c_str() )->weight;
}
}
return bio_weight;
Expand Down Expand Up @@ -5405,9 +5405,9 @@ int Character::get_env_resist( body_part bp ) const
}
}

for( const bionic &bio : *my_bionics ) {
const auto EP = bio.info().env_protec.find( bp );
if( EP != bio.info().env_protec.end() ) {
for( const bionic_id bid : get_bionics() ) {
const auto EP = bid->env_protec.find( bp );
if( EP != bid->env_protec.end() ) {
ret += EP->second;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/crafting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,8 +549,8 @@ const inventory &player::crafting_inventory( const tripoint &src_pos, int radius
cached_crafting_inventory += inv;
cached_crafting_inventory += weapon;
cached_crafting_inventory += worn;
for( const auto &bio : *my_bionics ) {
const auto &bio_data = bio.info();
for( const bionic &bio : *my_bionics ) {
const bionic_data &bio_data = bio.info();
if( ( !bio_data.activated || bio.powered ) &&
!bio_data.fake_item.empty() ) {
cached_crafting_inventory += item( bio.info().fake_item,
Expand Down
2 changes: 1 addition & 1 deletion src/faction_camp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3522,7 +3522,7 @@ int basecamp::recruit_evaluation( int &sbase, int &sexpansions, int &sfaction, i
}
//More machine than man
//Bionics count > 10, respect > 75
if( g->u.my_bionics->size() > 10 && camp_discipline() > 75 ) {
if( g->u.get_bionics().size() > 10 && camp_discipline() > 75 ) {
sbonus += 10;
}
//Survival of the fittest
Expand Down
4 changes: 2 additions & 2 deletions src/iexamine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4553,14 +4553,14 @@ void iexamine::autodoc( player &p, const tripoint &examp )
}

case UNINSTALL_CBM: {
bionic_collection installed_bionics = *patient.my_bionics;
const bionic_collection &installed_bionics = *patient.my_bionics;
if( installed_bionics.empty() ) {
popup_player_or_npc( patient, _( "You don't have any bionics installed." ),
_( "<npcname> doesn't have any bionics installed." ) );
return;
}

for( auto &bio : installed_bionics ) {
for( const bionic &bio : installed_bionics ) {
if( bio.id != bionic_id( "bio_power_storage" ) ||
bio.id != bionic_id( "bio_power_storage_mkII" ) ) {
if( item::type_is_defined( bio.id.str() ) ) {// put cbm items in your inventory
Expand Down
10 changes: 5 additions & 5 deletions src/monmove.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,13 +996,13 @@ void monster::nursebot_operate( player *dragged_foe )
if( get_effect_dur( effect_countdown ) == 1_turns && !has_effect( effect_operating ) ) {
if( dragged_foe->has_effect( effect_grabbed ) ) {

bionic_collection collec = *dragged_foe->my_bionics;
int index = rng( 0, collec.size() - 1 );
bionic target_cbm = collec[index];
const bionic_collection &collec = *dragged_foe->my_bionics;
const int index = rng( 0, collec.size() - 1 );
const bionic &target_cbm = collec[index];

//8 intelligence*4 + 8 first aid*4 + 3 computer *3 + 4 electronic*1 = 77
float adjusted_skill = static_cast<float>( 77 ) - std::min( static_cast<float>( 40 ),
static_cast<float>( 77 ) - static_cast<float>( 77 ) / static_cast<float>( 10.0 ) );
const float adjusted_skill = static_cast<float>( 77 ) - std::min( static_cast<float>( 40 ),
static_cast<float>( 77 ) - static_cast<float>( 77 ) / static_cast<float>( 10.0 ) );

g->u.uninstall_bionic( target_cbm, *this, *dragged_foe, adjusted_skill );

Expand Down
6 changes: 3 additions & 3 deletions src/npcmove.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,7 @@ void npc::deactivate_combat_cbms()
bool npc::activate_bionic_by_id( const bionic_id &cbm_id, bool eff_only )
{
int index = 0;
for( auto &i : *my_bionics ) {
for( const bionic &i : *my_bionics ) {
if( i.id == cbm_id ) {
if( !i.powered ) {
return activate_bionic( index, eff_only );
Expand All @@ -1564,7 +1564,7 @@ bool npc::activate_bionic_by_id( const bionic_id &cbm_id, bool eff_only )
bool npc::use_bionic_by_id( const bionic_id &cbm_id, bool eff_only )
{
int index = 0;
for( auto &i : *my_bionics ) {
for( const bionic &i : *my_bionics ) {
if( i.id == cbm_id ) {
if( !i.powered ) {
return activate_bionic( index, eff_only );
Expand All @@ -1580,7 +1580,7 @@ bool npc::use_bionic_by_id( const bionic_id &cbm_id, bool eff_only )
bool npc::deactivate_bionic_by_id( const bionic_id &cbm_id, bool eff_only )
{
int index = 0;
for( auto &i : *my_bionics ) {
for( const bionic &i : *my_bionics ) {
if( i.id == cbm_id ) {
if( i.powered ) {
return deactivate_bionic( index, eff_only );
Expand Down
4 changes: 2 additions & 2 deletions src/npctalk_funcs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,15 @@ void talk_function::bionic_install( npc &p )

void talk_function::bionic_remove( npc &p )
{
bionic_collection all_bio = *g->u.my_bionics;
const bionic_collection all_bio = *g->u.my_bionics;
if( all_bio.empty() ) {
popup( _( "You don't have any bionics installed…" ) );
return;
}

std::vector<itype_id> bionic_types;
std::vector<std::string> bionic_names;
for( auto &bio : all_bio ) {
for( const bionic &bio : all_bio ) {
if( std::find( bionic_types.begin(), bionic_types.end(), bio.id.str() ) == bionic_types.end() ) {
if( bio.id != bionic_id( "bio_power_storage" ) ||
bio.id != bionic_id( "bio_power_storage_mkII" ) ) {
Expand Down
4 changes: 2 additions & 2 deletions src/player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6745,7 +6745,7 @@ void player::place_corpse()
for( auto itm : tmp ) {
g->m.add_item_or_charges( pos(), *itm );
}
for( auto &bio : *my_bionics ) {
for( const bionic &bio : *my_bionics ) {
if( item::type_is_defined( bio.id.str() ) ) {
item cbm( bio.id.str(), calendar::turn );
cbm.set_flag( "FILTHY" );
Expand Down Expand Up @@ -6794,7 +6794,7 @@ void player::place_corpse( const tripoint &om_target )
for( auto itm : tmp ) {
bay.add_item_or_charges( point( finX, finY ), *itm );
}
for( auto &bio : *my_bionics ) {
for( const bionic &bio : *my_bionics ) {
if( item::type_is_defined( bio.id.str() ) ) {
body.put_in( item( bio.id.str(), calendar::turn ) );
}
Expand Down
2 changes: 1 addition & 1 deletion src/suffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ void Character::suffer()
}
}

for( size_t i = 0; i < my_bionics->size(); i++ ) {
for( size_t i = 0; i < get_bionics().size(); i++ ) {
process_bionic( i );
}

Expand Down

0 comments on commit bcd1812

Please sign in to comment.