diff options
| author | Haru <haru@dotalux.com> | 2018-05-07 00:18:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 00:18:23 +0200 |
| commit | 4c4d0c3471891142bd28c60aa34b0c278531a417 (patch) | |
| tree | 3a44b6e20489cd0bf9409735768f76331574cb12 /src/map/skill.c | |
| parent | 456e3effa7e4d376e2a1bd6f8128e59b0e8c78af (diff) | |
| parent | 5c9ae7b9559438654265e3dd9afd26f30d499fcc (diff) | |
| download | hercules-4c4d0c3471891142bd28c60aa34b0c278531a417.tar.gz hercules-4c4d0c3471891142bd28c60aa34b0c278531a417.tar.bz2 hercules-4c4d0c3471891142bd28c60aa34b0c278531a417.tar.xz hercules-4c4d0c3471891142bd28c60aa34b0c278531a417.zip | |
Merge pull request #2027 from MishimaHaruna/sa_summonmonster
Fix the name of monsters summoned through SA_SUMMONMONSTER
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 87e869ec7..1ab8ce871 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6304,7 +6304,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin break; case SA_SUMMONMONSTER: clif->skill_nodamage(src,bl,skill_id,skill_lv,1); - if (sd) mob->once_spawn(sd, src->m, src->x, src->y," --ja--", -1, 1, "", SZ_SMALL, AI_NONE); + if (sd != NULL) + mob->once_spawn(sd, src->m, src->x, src->y, DEFAULT_MOB_JNAME, -1, 1, "", SZ_SMALL, AI_NONE); break; case SA_LEVELUP: clif->skill_nodamage(src,bl,skill_id,skill_lv,1); @@ -11429,7 +11430,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); } else { int mob_id = skill_lv < 2 ? MOBID_BLACK_MUSHROOM + rnd()%2 : MOBID_RED_PLANT + rnd()%6; - struct mob_data *md = mob->once_spawn_sub(src, src->m, x, y, "--ja--", mob_id, "", SZ_SMALL, AI_NONE); + struct mob_data *md = mob->once_spawn_sub(src, src->m, x, y, DEFAULT_MOB_JNAME, mob_id, "", SZ_SMALL, AI_NONE); int i; if (md == NULL) break; |