summaryrefslogtreecommitdiff
path: root/src/localplayer.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-28 21:38:28 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-28 21:43:36 +0300
commit5463aed3e9b8dc08f9e19d2ad37a277e02db66ed (patch)
tree4a946a58ff9e57a76d94e1b0bf44ed4a9f443d10 /src/localplayer.h
parent03bfe2db420e0b219451590e14bb34c03c71f03c (diff)
downloadmv-5463aed3e9b8dc08f9e19d2ad37a277e02db66ed.tar.gz
mv-5463aed3e9b8dc08f9e19d2ad37a277e02db66ed.tar.bz2
mv-5463aed3e9b8dc08f9e19d2ad37a277e02db66ed.tar.xz
mv-5463aed3e9b8dc08f9e19d2ad37a277e02db66ed.zip
Improve localplayer class.
Diffstat (limited to 'src/localplayer.h')
-rw-r--r--src/localplayer.h40
1 files changed, 10 insertions, 30 deletions
diff --git a/src/localplayer.h b/src/localplayer.h
index 600c8aef4..7315861ed 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -108,20 +108,6 @@ class LocalPlayer final : public Being,
virtual void nextTile(unsigned char dir);
- /**
- * Check the player has permission to invite users to specific guild
- */
- bool checkInviteRights(const std::string &guildName)
- const A_WARN_UNUSED;
-
- /**
- * Invite a player to join guild
- */
- void inviteToGuild(Being *const being);
-
-// void clearInventory();
-// void setInvItem(int index, int id, int amount);
-
bool pickUp(FloorItem *const item);
/**
@@ -198,9 +184,9 @@ class LocalPlayer final : public Being,
bool toggleSit() const;
- bool updateSit();
+ bool updateSit() const;
- bool emote(const uint8_t emotion) const;
+ static bool emote(const uint8_t emotion);
/**
* Shows item pickup notifications.
@@ -211,8 +197,6 @@ class LocalPlayer final : public Being,
int getLevel() const override A_WARN_UNUSED;
- int getTargetTime() A_WARN_UNUSED;
-
/** Tells that the path has been set by mouse. */
void pathSetByMouse()
{ mPathSetByMouse = true; }
@@ -314,7 +298,7 @@ class LocalPlayer final : public Being,
void moveToHome();
- void debugMsg(std::string str) const;
+ void debugMsg(const std::string &str) const;
bool isReachable(const int x, const int y,
const int maxCost = 0) const A_WARN_UNUSED;
@@ -372,8 +356,6 @@ class LocalPlayer final : public Being,
bool allowAction() A_WARN_UNUSED;
- bool allowMove() const A_WARN_UNUSED;
-
void setRealPos(const int x, const int y);
bool isServerBuggy() const A_WARN_UNUSED
@@ -400,12 +382,12 @@ class LocalPlayer final : public Being,
/**
* set a following player.
*/
- void setFollow(std::string player);
+ void setFollow(const std::string &player);
/**
* set an imitation player.
*/
- void setImitate(std::string player);
+ void setImitate(const std::string &player);
/**
* setting the next destination of the following, in case of warp
@@ -461,14 +443,14 @@ class LocalPlayer final : public Being,
void updateNavigateList();
- int getPathLength(const Being *const being) A_WARN_UNUSED;
+ int getPathLength(const Being *const being) const A_WARN_UNUSED;
void targetMoved() const;
- void setLastHitFrom(std::string n)
+ void setLastHitFrom(const std::string &n)
{ mLastHitFrom = n; }
- void waitFor(std::string nick);
+ void waitFor(const std::string &nick);
void checkNewName(Being *const being);
@@ -530,8 +512,8 @@ class LocalPlayer final : public Being,
void changeEquipmentBeforeAttack(const Being *const target) const;
- void tryMagic(const std::string &spell, const int baseMagic,
- const int schoolMagic, const int mana) const;
+ static void tryMagic(const std::string &spell, const int baseMagic,
+ const int schoolMagic, const int mana);
const char *getVarItem(const char *const *const arr,
const unsigned index,
@@ -557,8 +539,6 @@ class LocalPlayer final : public Being,
void loadHomes();
int mTargetTime; /** How long the being has been targeted **/
- int mLastTarget; /** Time stamp of last targeting action,
- -1 if none. */
int mGMLevel;
//move type