summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-17 18:22:18 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-17 18:22:18 +0300
commitfed37f530d063cbce6a9bba7f1a878c42e10367e (patch)
treebb0e3566e390634becf38b2c8eda22ef25e02016 /src/being
parent5eeb34b86751fff15a59702ce13a772bd39fd338 (diff)
downloadmv-fed37f530d063cbce6a9bba7f1a878c42e10367e.tar.gz
mv-fed37f530d063cbce6a9bba7f1a878c42e10367e.tar.bz2
mv-fed37f530d063cbce6a9bba7f1a878c42e10367e.tar.xz
mv-fed37f530d063cbce6a9bba7f1a878c42e10367e.zip
Add missing A_DEFAULT_COPY / A_DELETE_COPY into being.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/being/being.h2
-rw-r--r--src/being/playerinfo.h4
-rw-r--r--src/being/playerrelations.cpp21
4 files changed, 28 insertions, 1 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 575744d77..0cbb88d99 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -193,6 +193,8 @@ void ActorSprite::setTargetType(const TargetCursorTypeT type)
struct EffectDescription final
{
+ A_DELETE_COPY(EffectDescription)
+
std::string mGFXEffect;
std::string mSFXEffect;
};
diff --git a/src/being/being.h b/src/being/being.h
index 2fb8a4b51..9477abab5 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -78,6 +78,8 @@ struct NextSoundInfo final
{
}
+ A_DELETE_COPY(NextSoundInfo)
+
const SoundInfo *sound;
int x;
int y;
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index 5b512eb05..0372bafc4 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -44,6 +44,8 @@
*/
struct Stat final
{
+ A_DEFAULT_COPY(Stat)
+
int base;
int mod;
int exp;
@@ -65,6 +67,8 @@ struct PlayerInfoBackend final
{
}
+ A_DEFAULT_COPY(PlayerInfoBackend)
+
AtrIntMap mAttributes;
StatMap mStats;
IntMap mSkills;
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 264f5c3a0..c972f25ca 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -59,6 +59,11 @@ namespace
class SortPlayersFunctor final
{
public:
+ SortPlayersFunctor()
+ { }
+
+ A_DEFAULT_COPY(SortPlayersFunctor)
+
bool operator() (const std::string &str1,
const std::string &str2) const
{
@@ -78,6 +83,11 @@ namespace
PlayerRelation *>, std::map<std::string, PlayerRelation *> *>
{
public:
+ PlayerConfSerialiser()
+ { }
+
+ A_DELETE_COPY(PlayerConfSerialiser)
+
ConfigurationObject *writeConfigItem(
const std::pair<std::string, PlayerRelation *> &value,
ConfigurationObject *const cobj) const override final
@@ -468,6 +478,8 @@ class PIS_nothing final : public PlayerIgnoreStrategy
mShortName = PLAYER_IGNORE_STRATEGY_NOP;
}
+ A_DELETE_COPY(PIS_nothing)
+
void ignore(Being *const being A_UNUSED,
const unsigned int flags A_UNUSED) const override final
{
@@ -485,6 +497,8 @@ class PIS_dotdotdot final : public PlayerIgnoreStrategy
mShortName = "dotdotdot";
}
+ A_DELETE_COPY(PIS_dotdotdot)
+
void ignore(Being *const being,
const unsigned int flags A_UNUSED) const override final
{
@@ -508,6 +522,8 @@ class PIS_blinkname final : public PlayerIgnoreStrategy
mShortName = "blinkname";
}
+ A_DELETE_COPY(PIS_blinkname)
+
void ignore(Being *const being,
const unsigned int flags A_UNUSED) const override final
{
@@ -522,7 +538,8 @@ class PIS_blinkname final : public PlayerIgnoreStrategy
class PIS_emote final : public PlayerIgnoreStrategy
{
public:
- PIS_emote(const uint8_t emote_nr, const std::string &description,
+ PIS_emote(const uint8_t emote_nr,
+ const std::string &description,
const std::string &shortname) :
PlayerIgnoreStrategy(),
mEmotion(emote_nr)
@@ -531,6 +548,8 @@ class PIS_emote final : public PlayerIgnoreStrategy
mShortName = shortname;
}
+ A_DELETE_COPY(PIS_emote)
+
void ignore(Being *const being,
const unsigned int flags A_UNUSED) const override final
{