diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/actorsprite.h | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/actorsprite.h')
| -rw-r--r-- | src/actorsprite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/actorsprite.h b/src/actorsprite.h index 81bbd963..af06b478 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -185,7 +185,7 @@ protected: /** * Handle an update to a status or stun effect * - * \param The StatusEffect to effect + * \param effect The StatusEffect to effect * \param effectId -1 for stun, otherwise the effect index */ virtual void handleStatusEffect(StatusEffect *effect, int effectId); |