diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-11-01 20:04:43 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-11-01 20:04:43 +0100 |
| commit | 38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad (patch) | |
| tree | 81d0e898790264114683cca9cfd3355bea114415 /src/being.h | |
| parent | c5e341f7b5f5e4efcabd09e00e177bb873db8097 (diff) | |
| parent | 1f69108501c4bf51f3adac9ffbf7a7631fb12b9a (diff) | |
| download | Mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.gz Mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.bz2 Mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.xz Mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.zip | |
Merge branch '0.5' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
src/client.cpp
src/commandhandler.cpp
src/gui/setup_video.cpp
src/gui/socialwindow.cpp
src/gui/viewport.cpp
src/gui/widgets/browserbox.cpp
src/gui/widgets/itemcontainer.cpp
src/imageparticle.cpp
src/localplayer.cpp
src/localplayer.h
src/map.cpp
src/net/tmwa/beinghandler.cpp
src/particle.cpp
src/particle.h
src/player.cpp
src/player.h
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/being.h b/src/being.h index a55e2d3a..0d1816f9 100644 --- a/src/being.h +++ b/src/being.h @@ -490,6 +490,18 @@ class Being : public ActorSprite, public ConfigListener, public Mana::Listener */ void setGM(bool gm); + /** + * Sets the IP or an IP hash. + * The TMW-Athena server sends this information only to GMs. + */ + void setIp(int ip) { mIp = ip; } + + /** + * Returns the player's IP or an IP hash. + * Value is 0 if not set by the server. + */ + int getIp() const { return mIp; } + bool canTalk(); void talkTo(); @@ -585,6 +597,8 @@ class Being : public ActorSprite, public ConfigListener, public Mana::Listener int mX, mY; /**< Position in tile */ int mDamageTaken; + + int mIp; }; #endif |