diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-26 13:54:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-26 14:41:36 +0300 |
| commit | 851cc4e95093cb7bd1adce99be95a864d68f8d38 (patch) | |
| tree | 50096efbfea146de63432ca95d1faacdbd62df80 /src/being | |
| parent | 476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f (diff) | |
| download | manaplus-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.gz manaplus-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.bz2 manaplus-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.xz manaplus-851cc4e95093cb7bd1adce99be95a864d68f8d38.zip | |
remove useless virtual keywords.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/localplayer.h | 17 | ||||
| -rw-r--r-- | src/being/playerrelations.cpp | 20 |
2 files changed, 18 insertions, 19 deletions
diff --git a/src/being/localplayer.h b/src/being/localplayer.h index abc4644e2..adf712187 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -81,12 +81,12 @@ class LocalPlayer final : public Being, */ ~LocalPlayer(); - virtual void logic() override; + void logic() override; void slowLogic(); - virtual void setAction(const Action &action, - const int attackType = 0) override; + void setAction(const Action &action, + const int attackType = 0) override; /** * Compute the next pathnode location when walking using keyboard. @@ -101,10 +101,10 @@ class LocalPlayer final : public Being, * Also, when specified, it picks up an item at the end of a path * or attack target. */ - virtual void nextTile() override + void nextTile() override { nextTile(0); } - virtual void nextTile(unsigned char dir); + void nextTile(unsigned char dir); bool pickUp(FloorItem *const item); @@ -150,7 +150,7 @@ class LocalPlayer final : public Being, /** * Sets a new destination for this being to walk to. */ - virtual void setDestination(const int x, const int y); + void setDestination(const int x, const int y); /** * Sets a new direction to keep walking in. @@ -503,9 +503,8 @@ class LocalPlayer final : public Being, protected: void updateCoords() override; - - virtual void handleStatusEffect(StatusEffect *const effect, - const int effectId); + void handleStatusEffect(StatusEffect *const effect, + const int effectId); void startWalking(const unsigned char dir); diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 7e5807166..fc4889951 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -71,7 +71,7 @@ class PlayerConfSerialiser final : std::map<std::string, PlayerRelation *> *> { public: - virtual ConfigurationObject *writeConfigItem( + ConfigurationObject *writeConfigItem( const std::pair<std::string, PlayerRelation *> &value, ConfigurationObject *const cobj) const override { @@ -84,7 +84,7 @@ public: return cobj; } - virtual std::map<std::string, PlayerRelation *> * + std::map<std::string, PlayerRelation *> * readConfigItem(const ConfigurationObject *const cobj, std::map<std::string, PlayerRelation *> *const container) const override @@ -467,8 +467,8 @@ public: mShortName = PLAYER_IGNORE_STRATEGY_NOP; } - virtual void ignore(Being *const being A_UNUSED, - const unsigned int flags A_UNUSED) const override + void ignore(Being *const being A_UNUSED, + const unsigned int flags A_UNUSED) const override { } }; @@ -484,8 +484,8 @@ public: mShortName = "dotdotdot"; } - virtual void ignore(Being *const being, - const unsigned int flags A_UNUSED) const override + void ignore(Being *const being, + const unsigned int flags A_UNUSED) const override { if (!being) return; @@ -507,8 +507,8 @@ public: mShortName = "blinkname"; } - virtual void ignore(Being *const being, - const unsigned int flags A_UNUSED) const override + void ignore(Being *const being, + const unsigned int flags A_UNUSED) const override { if (!being) return; @@ -530,8 +530,8 @@ public: mShortName = shortname; } - virtual void ignore(Being *const being, - const unsigned int flags A_UNUSED) const override + void ignore(Being *const being, + const unsigned int flags A_UNUSED) const override { if (!being) return; |