0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use unit_ptr in a few more places for increased consistency

Browse source
This commit is contained in:
Celtic Minstrel 2018-03-11 01:14:55 -05:00
parent a32f6aaf64
commit a8f2500773
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/reports.cpp
View file

@ -660,7 +660,7 @@ static int attack_info(reports::context & rc, const attack_type &at, config &res
int damage = 0;
{
auto ctx = at.specials_context(&u, displayed_unit_hex, u.side() == rc.screen().playing_side());
auto ctx = at.specials_context(unit_const_ptr(&u), displayed_unit_hex, u.side() == rc.screen().playing_side());
int base_damage = at.damage();
int specials_damage = at.modified_damage(false);
int damage_multiplier = 100;

22
src/units/abilities.cpp
View file

@ -46,9 +46,9 @@ namespace {
class temporary_facing
{
map_location::DIRECTION save_dir_;
const unit* u_;
unit_const_ptr u_;
public:
temporary_facing(const unit* u, map_location::DIRECTION new_dir)
temporary_facing(unit_const_ptr u, map_location::DIRECTION new_dir)
: save_dir_(u ? u->facing() : map_location::NDIRECTIONS)
, u_(u)
{
@ -705,8 +705,8 @@ std::string attack_type::weapon_specials(bool only_active, bool is_backstab) con
*/
attack_type::specials_context_t::specials_context_t(const attack_type& weapon,
const_attack_ptr other_attack,
const unit* self,
const unit* other,
unit_const_ptr self,
unit_const_ptr other,
const map_location& unit_loc,
const map_location& other_loc,
bool attacking)
@ -728,7 +728,7 @@ attack_type::specials_context_t::specials_context_t(const attack_type& weapon,
* @param[in] loc The location of the unit with this weapon.
* @param[in] attacking Whether or not the unit with this weapon is the attacker.
*/
attack_type::specials_context_t::specials_context_t(const attack_type& weapon, const unit* self, const map_location& loc, bool attacking)
attack_type::specials_context_t::specials_context_t(const attack_type& weapon, unit_const_ptr self, const map_location& loc, bool attacking)
: parent(weapon.shared_from_this())
{
weapon.self_ = self;
@ -881,8 +881,8 @@ namespace { // Helpers for attack_type::special_active()
* @param[in] filter The filter containing the child filter to use.
* @param[in] child_tag The tag of the child filter to use.
*/
static bool special_unit_matches(const unit* & u,
const unit* & u2,
static bool special_unit_matches(unit_const_ptr & u,
unit_const_ptr & u2,
const map_location & loc,
const_attack_ptr weapon,
const config & filter,
@ -973,8 +973,8 @@ bool attack_type::special_active(const config& special, AFFECTS whom,
assert(display::get_singleton());
const unit_map& units = display::get_singleton()->get_units();
const unit* self = self_;
const unit* other = other_;
unit_const_ptr self = self_;
unit_const_ptr other = other_;
if(self == nullptr) {
unit_map::const_iterator it = units.find(self_loc_);
@ -994,8 +994,8 @@ bool attack_type::special_active(const config& special, AFFECTS whom,
temporary_facing other_facing(other, other_loc_.get_relative_dir(self_loc_));
// Translate our context into terms of "attacker" and "defender".
const unit* & att = is_attacker_ ? self : other;
const unit* & def = is_attacker_ ? other : self;
unit_const_ptr & att = is_attacker_ ? self : other;
unit_const_ptr & def = is_attacker_ ? other : self;
const map_location & att_loc = is_attacker_ ? self_loc_ : other_loc_;
const map_location & def_loc = is_attacker_ ? other_loc_ : self_loc_;
const_attack_ptr att_weapon = is_attacker_ ? shared_from_this() : other_attack_;

12
src/units/attack_type.hpp
View file

@ -104,8 +104,8 @@ private:
// considered active.
friend class specials_context_t;
mutable map_location self_loc_, other_loc_;
mutable const unit* self_;
mutable const unit* other_;
mutable unit_const_ptr self_;
mutable unit_const_ptr other_;
mutable bool is_attacker_;
mutable const_attack_ptr other_attack_;
mutable bool is_for_listing_ = false;
@ -119,11 +119,11 @@ public:
specials_context_t(const attack_type& weapon, const unit_type& self_type, const map_location& loc, bool attacking = true);
/// Initialize weapon specials context for a single unit
specials_context_t(const attack_type& weapon, const_attack_ptr other_weapon,
const unit* self, const unit* other,
unit_const_ptr self, unit_const_ptr other,
const map_location& self_loc, const map_location& other_loc,
bool attacking);
/// Initialize weapon specials context for a pair of units
specials_context_t(const attack_type& weapon, const unit* self, const map_location& loc, bool attacking);
specials_context_t(const attack_type& weapon, unit_const_ptr self, const map_location& loc, bool attacking);
specials_context_t(const specials_context_t&) = delete;
bool was_moved = false;
public:
@ -133,12 +133,12 @@ public:
};
// Set up a specials context.
// Usage: auto ctx = weapon.specials_context(...);
specials_context_t specials_context(const unit* self, const unit* other,
specials_context_t specials_context(unit_const_ptr self, unit_const_ptr other,
const map_location& unit_loc, const map_location& other_loc,
bool attacking, const_attack_ptr other_attack) const {
return specials_context_t(*this, other_attack, self, other, unit_loc, other_loc, attacking);
}
specials_context_t specials_context(const unit* self, const map_location& loc, bool attacking = true) const {
specials_context_t specials_context(unit_const_ptr self, const map_location& loc, bool attacking = true) const {
return specials_context_t(*this, self, loc, attacking);
}
specials_context_t specials_context(const unit_type& self_type, const map_location& loc, bool attacking = true) const {