diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-11 23:40:01 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-11 23:40:01 +0000 |
| commit | 8343a8489052407983d50e3e6804570e409c8604 (patch) | |
| tree | 493448f933614153c4c42760d7a827f69e236774 /src/map/atcommand.c | |
| parent | 46ac6483d91119a3f49630748fe6ea4f1a75c9b5 (diff) | |
| download | hercules-8343a8489052407983d50e3e6804570e409c8604.tar.gz hercules-8343a8489052407983d50e3e6804570e409c8604.tar.bz2 hercules-8343a8489052407983d50e3e6804570e409c8604.tar.xz hercules-8343a8489052407983d50e3e6804570e409c8604.zip | |
fix to bug on import of atcommand_athena, bugreport:5207
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15431 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 40d1590b1..cf12836e3 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9258,10 +9258,11 @@ void atcommand_parse_aliases(char aliases[1024],AtCommandInfo* base) { return; for(i = 0; i < max;i++) { - AtCommandInfo* atcommand; + AtCommandInfo* atcommand = NULL; normalize_name(str[i]," ");//trim over - if( strdb_exists(atcommand_db, str[i]) ) { - ShowError("atcommand_conf: duplicate alises error: %s (from %s)\n",str[i],base->command); + if( (atcommand = strdb_get(atcommand_db, str[i])) ) { + atcommand->level = base->level; + atcommand->level2 = base->level2; continue; } |