From e29b26303d10d795deb225105b0254a501970c59 Mon Sep 17 00:00:00 2001 From: Peisong Xiao Date: Mon, 15 Jul 2024 16:54:19 -0400 Subject: [PATCH] removed character::move --- src/characters.cc | 11 ----------- src/characters.h | 2 -- src/player.h | 3 +-- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/characters.cc b/src/characters.cc index 0d664f4..6203f55 100644 --- a/src/characters.cc +++ b/src/characters.cc @@ -75,17 +75,6 @@ void character::discard_level_effects() { std::swap(tmp, effects); } -// IMPORTANT: remember to check if player is on the stairs -long_result character::move(level *lvl, - const position &p) { - if (lvl->is_available(p)) { - pos = p; - return {result::moved, ""}; - } - - return {result::fine, ""}; -} - int calc_dmg(const int ATK, const int DEF) { return ceil((100.0f / (100.0f + DEF)) * ATK); } diff --git a/src/characters.h b/src/characters.h index 888d476..5b9543f 100644 --- a/src/characters.h +++ b/src/characters.h @@ -22,8 +22,6 @@ public: character(RNG *rng, const feature enabled_features, const race &nrace, const position &pos); // fills out the starting stats - virtual long_result move(level *lvl, const position &p); - virtual long_result attack(character *ch) = 0; virtual long_result get_hit(character *ch, const int tATK, const fraction &hit_rate) = 0; diff --git a/src/player.h b/src/player.h index 6c8c3a3..0139bc4 100644 --- a/src/player.h +++ b/src/player.h @@ -12,8 +12,7 @@ protected: public: player_base(RNG *rng, const feature enabled_features, const enum race &nrace); - virtual long_result move(level *lvl, - const position &p) override; + virtual long_result move(level *lvl, const position &p); virtual long_result apply(potion *p);