diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
| commit | 4263962e947b4914de8d1750f21cc7cc82567b4d (patch) | |
| tree | 32340098913c302fdb33f88ffea65fb36920db75 /src/localplayer.h | |
| parent | dd0844b6ac01293e7afd0dd85e695b8d77b8e4be (diff) | |
| parent | 7e2673a3b9460fdcd646e23c3bd9039de854565f (diff) | |
| download | mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.gz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.bz2 mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.xz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.zip | |
More merges and conflict resolves
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 0b41ca82..691307ba 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -118,8 +118,6 @@ class LocalPlayer : public Player */ ~LocalPlayer(); - virtual void setName(const std::string &name); - virtual void logic(); virtual void setAction(Action action, int attackType = 0); @@ -375,9 +373,17 @@ class LocalPlayer : public Player void addMessageToQueue(const std::string &message, Palette::ColorType color = Palette::EXP_INFO); + /** + * Called when a option (set with config.addListener()) is changed + */ + void optionChanged(const std::string &value); + protected: virtual void handleStatusEffect(StatusEffect *effect, int effectId); + // Colors don't change for local player + virtual void updateColors() {} + void walk(unsigned char dir); bool mInStorage; /**< Whether storage is currently accessible */ |