summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actor.h4
-rw-r--r--src/being/playerrelations.h18
2 files changed, 12 insertions, 10 deletions
diff --git a/src/being/actor.h b/src/being/actor.h
index 9467c87eb..03f301a78 100644
--- a/src/being/actor.h
+++ b/src/being/actor.h
@@ -38,8 +38,6 @@ typedef Actors::const_iterator ActorsCIter;
class Actor
{
public:
- Actor();
-
A_DELETE_COPY(Actor)
virtual ~Actor();
@@ -130,6 +128,8 @@ public:
{ return mMap; }
protected:
+ Actor();
+
Map *mMap;
Vector mPos; /**< Position in pixels relative to map. */
int mYDiff;
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index 5d11b5b25..c24363fcf 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -79,12 +79,6 @@ class PlayerIgnoreStrategy
std::string mDescription;
std::string mShortName;
- PlayerIgnoreStrategy() :
- mDescription(),
- mShortName()
- {
- }
-
A_DELETE_COPY(PlayerIgnoreStrategy)
virtual ~PlayerIgnoreStrategy()
@@ -95,13 +89,17 @@ class PlayerIgnoreStrategy
*/
virtual void ignore(Being *const being,
const unsigned int flags) const = 0;
+ protected:
+ PlayerIgnoreStrategy() :
+ mDescription(),
+ mShortName()
+ {
+ }
};
class PlayerRelationsListener
{
public:
- PlayerRelationsListener()
- { }
virtual ~PlayerRelationsListener()
{ }
@@ -109,6 +107,10 @@ class PlayerRelationsListener
virtual void updatedPlayer(const std::string &name) = 0;
virtual void updateAll() = 0;
+
+ protected:
+ PlayerRelationsListener()
+ { }
};
/**