diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
| commit | 22142fd2cc8dd262ca1202ffeb5f4ef714870c4c (patch) | |
| tree | ca0a1eaeb781baec2c4e5b22cf9df60fa89f2982 /src/scripting/lua.cpp | |
| parent | 5bd0ddb6e2d1b002372541f911a2764ed2e54e6c (diff) | |
| parent | a5895b1655be3e81f451844a911eab8b798fa7ab (diff) | |
| download | manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.gz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.bz2 manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.xz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/character.cpp
src/scripting/lua.cpp
Diffstat (limited to 'src/scripting/lua.cpp')
| -rw-r--r-- | src/scripting/lua.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index 03d08771..1bb75137 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -477,7 +477,7 @@ static int chr_inv_count(lua_State *s) } /** - * mana.chr_get_level(): int level + * mana.chr_get_level(Character*): int level * Tells the character current level. */ static int chr_get_level(lua_State *s) |