Deukhoofd/CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ExecutingAttack use smart pointers.

Browse Source
This commit is contained in:
Deukhoofd
2020-06-02 18:02:37 +02:00
parent a5a613ba5c
commit 7262ae9e8b
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Battling/Models/ExecutingAttack.hpp
View File

@@ -38,16 +38,16 @@ namespace CreatureLib::Battling {
private:
ArbUt::List<ArbUt::BorrowedPtr<Creature>> _targets;
uint8_t _numberHits;
HitData* _hits;
Creature* _user;
std::unique_ptr<HitData[]> _hits;
ArbUt::BorrowedPtr<Creature> _user;
ArbUt::BorrowedPtr<LearnedAttack> _attack;
std::unique_ptr<Script> _script = nullptr;
public:
ExecutingAttack(const ArbUt::List<ArbUt::BorrowedPtr<Creature>>& targets, uint8_t numberHits, Creature* user,
const ArbUt::BorrowedPtr<LearnedAttack>& attack, const std::unique_ptr<Script>& script)
: _targets(targets.Count()), _numberHits(numberHits), _hits(new HitData[targets.Count() * numberHits]),
_user(user), _attack(attack) {
: _targets(targets.Count()), _numberHits(numberHits),
_hits(std::make_unique<HitData[]>(targets.Count() * numberHits)), _user(user), _attack(attack) {
AssertNotNull(user)
AssertNotNull(attack)
for (auto target : targets) {
@@ -59,7 +59,7 @@ namespace CreatureLib::Battling {
ExecutingAttack(const ExecutingAttack&) = delete;
ExecutingAttack& operator=(const ExecutingAttack&) = delete;
virtual ~ExecutingAttack() noexcept { delete[] _hits; };
virtual ~ExecutingAttack() noexcept = default;
HitData& GetHitData(Creature* creature, uint8_t hit) {
for (size_t i = 0; i < _targets.Count(); i++) {
@@ -73,8 +73,7 @@ namespace CreatureLib::Battling {
HitData* GetTargetIteratorBegin(Creature* creature) {
for (size_t i = 0; i < _targets.Count(); i++) {
if (_targets[i] == creature) {
auto v = _hits + (i * _numberHits * sizeof(HitData));
return v;
return &_hits[i * _numberHits * sizeof(HitData)];
}
}
throw CreatureException("Invalid target requested.");
@@ -84,7 +83,7 @@ namespace CreatureLib::Battling {
const ArbUt::List<ArbUt::BorrowedPtr<Creature>>& GetTargets() noexcept { return _targets; }
uint8_t GetNumberOfHits() const noexcept { return _numberHits; }
Creature* GetUser() noexcept { return _user; }
ArbUt::BorrowedPtr<Creature> GetUser() noexcept { return _user; }
const ArbUt::BorrowedPtr<LearnedAttack>& GetAttack() noexcept { return _attack; }
size_t ScriptCount() const override { return _user->ScriptCount() + 1; }