Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate more functions from player to character #39734

Merged
merged 2 commits into from
Apr 20, 2020
Merged

Migrate more functions from player to character #39734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc38706
Move from player to character
Ramza13 Apr 19, 2020
3729865
Move more code
Ramza13 Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions src/bionics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
#include "output.h"
#include "overmapbuffer.h"
#include "pimpl.h"
#include "player.h"
#include "player_activity.h"
#include "pldata.h"
#include "point.h"
Expand Down Expand Up @@ -989,19 +988,13 @@ bool Character::deactivate_bionic( int b, bool eff_only )
invalidate_crafting_inventory();
}

return true;
}

bool player::deactivate_bionic( int b, bool eff_only )
{
const bionic &bio = ( *my_bionics )[b];
bool success = Character::deactivate_bionic( b, eff_only );
// Compatibility with old saves without the toolset hammerspace
if( success && !eff_only && bio.id == bio_tools && !has_bionic( bionic_TOOLS_EXTEND ) ) {
if( !eff_only && bio.id == bio_tools && !has_bionic( bionic_TOOLS_EXTEND ) ) {
// E X T E N D T O O L S
add_bionic( bionic_TOOLS_EXTEND );
}
return success;

return true;
}

bool Character::burn_fuel( int b, bool start )
Expand Down Expand Up @@ -2454,12 +2447,12 @@ void Character::remove_bionic( const bionic_id &b )
}
}

int player::num_bionics() const
int Character::num_bionics() const
{
return my_bionics->size();
}

std::pair<int, int> player::amount_of_storage_bionics() const
std::pair<int, int> Character::amount_of_storage_bionics() const
{
units::energy lvl = get_max_power_level();

Expand Down Expand Up @@ -2492,12 +2485,12 @@ std::pair<int, int> player::amount_of_storage_bionics() const
return results;
}

bionic &player::bionic_at_index( int i )
bionic &Character::bionic_at_index( int i )
{
return ( *my_bionics )[i];
}

void player::clear_bionics()
void Character::clear_bionics()
{
my_bionics->clear();
}
Expand Down
Loading