diff options
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 2c06dfb5..a7ed33f8 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -22,7 +22,7 @@ #ifndef LOCALPLAYER_H #define LOCALPLAYER_H -#include "player.h" +#include "being.h" #include "gui/userpalette.h" @@ -109,7 +109,7 @@ enum /** * The local player character. */ -class LocalPlayer : public Player +class LocalPlayer : public Being { public: /** @@ -194,11 +194,6 @@ class LocalPlayer : public Player void attack(Being *target = NULL, bool keep = false); - /** - * Triggers whether or not to show the name as a GM name. - */ - virtual void setGM(bool gm); - void setGMLevel(int level); void stopAttack(); @@ -403,7 +398,7 @@ class LocalPlayer : public Player std::string getFollow() const { return mPlayerFollowed; } /** - * Tells the engine wether to check + * Tells the engine whether to check * if the Player Name is to be displayed. */ void setCheckNameSetting(bool checked) { mUpdateName = checked; } @@ -424,9 +419,6 @@ class LocalPlayer : public Player virtual void handleStatusEffect(StatusEffect *effect, int effectId); - // Colors don't change for local player - virtual void updateColors() {} - void startWalking(unsigned char dir); int mAttackRange; @@ -479,22 +471,6 @@ class LocalPlayer : public Player int mLocalWalkTime; /**< Timestamp used to control keyboard walk messages flooding */ - /** Load the target cursors into memory */ - void initTargetCursor(); - - /** - * Helper function for loading target cursors - */ - void loadTargetCursor(const std::string &filename, - int width, int height, - bool outRange, Being::TargetCursorSize size); - - /** Images of the target cursor. */ - ImageSet *mTargetCursorImages[2][NUM_TC]; - - /** Animated target cursors. */ - SimpleAnimation *mTargetCursor[2][NUM_TC]; - typedef std::pair<std::string, int> MessagePair; /** Queued exp messages*/ std::list<MessagePair> mMessages; |