From 6257baccabe0f4477e7d3165e52ddf714dcff540 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 Dec 2015 01:48:40 +0300
Subject: Add const attribute to being classes.
---
src/being/being.h | 6 +++---
src/being/localplayer.h | 5 +++--
src/being/playerinfo.cpp | 4 ----
src/being/playerinfo.h | 7 +------
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/being/being.h b/src/being/being.h
index 0f094c908..a2ca63cf0 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -236,7 +236,7 @@ class Being notfinal : public ActorSprite,
*/
void setGuildName(const std::string &name);
- void setGuildPos(const std::string &pos);
+ void setGuildPos(const std::string &pos) A_CONST;
/**
* Adds a guild to the being.
@@ -859,9 +859,9 @@ class Being notfinal : public ActorSprite,
void setLook(const uint16_t look);
- static uint8_t genderToInt(const GenderT sex) A_WARN_UNUSED;
+ static uint8_t genderToInt(const GenderT sex) A_CONST A_WARN_UNUSED;
- static GenderT intToGender(const uint8_t sex) A_WARN_UNUSED;
+ static GenderT intToGender(const uint8_t sex) A_CONST A_WARN_UNUSED;
NextSoundInfo mNextSound;
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index e47ad4d20..582382e2c 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -356,7 +356,7 @@ class LocalPlayer final : public Being,
int getPathLength(const Being *const being) const A_WARN_UNUSED;
- void targetMoved() const;
+ void targetMoved() const A_CONST;
void setLastHitFrom(const std::string &n)
{ mLastHitFrom = n; }
@@ -365,7 +365,8 @@ class LocalPlayer final : public Being,
void checkNewName(Being *const being);
- unsigned char getBlockWalkMask() const override final A_WARN_UNUSED;
+ unsigned char getBlockWalkMask() const override final
+ A_CONST A_WARN_UNUSED;
void saveHomes();
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 0f9eb6b6c..76ccdcce4 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -389,10 +389,6 @@ int getCharId()
return mCharId;
}
-void logic()
-{
-}
-
Trading isTrading()
{
return mTrading;
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index fbd8d4109..e40c2ac85 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -196,11 +196,6 @@ namespace PlayerInfo
int getCharId();
- /**
- * Does necessary updates every tick.
- */
- void logic();
-
/**
* Returns true if the player is involved in a trade at the moment, false
* otherwise.
@@ -217,7 +212,7 @@ namespace PlayerInfo
/**
* Initializes some internals.
*/
- void init();
+ void init() A_CONST;
void deinit();
--
cgit v1.2.3-70-g09d2