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/atcommand.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/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a130ecef3..aa8c9375b 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2056,7 +2056,7 @@ ACMD(monster) number = 1; if (!name[0]) - strcpy(name, "--ja--"); + strcpy(name, DEFAULT_MOB_JNAME); // If value of atcommand_spawn_quantity_limit directive is greater than or equal to 1 and quantity of monsters is greater than value of the directive if (battle_config.atc_spawn_quantity_limit && number > battle_config.atc_spawn_quantity_limit) @@ -6132,9 +6132,10 @@ ACMD(mobsearch) clif->message(fd, atcmd_output); return false; } - if (mob_id == atoi(mob_name)) - strcpy(mob_name,mob->db(mob_id)->jname); // --ja-- - //strcpy(mob_name,mob_db(mob_id)->name); // --en-- + if (mob_id == atoi(mob_name)) { + strcpy(mob_name,mob->db(mob_id)->jname); // DEFAULT_MOB_JNAME + //strcpy(mob_name,mob_db(mob_id)->name); // DEFAULT_MOB_NAME + } snprintf(atcmd_output, sizeof atcmd_output, msg_fd(fd,1220), mob_name, mapindex_id2name(sd->mapindex)); // Mob Search... %s %s clif->message(fd, atcmd_output); @@ -6377,7 +6378,7 @@ ACMD(summon) return false; } - md = mob->once_spawn_sub(&sd->bl, sd->bl.m, -1, -1, "--ja--", mob_id, "", SZ_SMALL, AI_NONE); + md = mob->once_spawn_sub(&sd->bl, sd->bl.m, -1, -1, DEFAULT_MOB_JNAME, mob_id, "", SZ_SMALL, AI_NONE); if(!md) return false; @@ -6818,9 +6819,10 @@ ACMD(showmobs) return false; } - if(mob_id == atoi(mob_name)) - strcpy(mob_name,mob->db(mob_id)->jname); // --ja-- - //strcpy(mob_name,mob_db(mob_id)->name); // --en-- + if (mob_id == atoi(mob_name)) { + strcpy(mob_name,mob->db(mob_id)->jname); // DEFAULT_MOB_JNAME + //strcpy(mob_name,mob_db(mob_id)->name); // DEFAULT_MOB_NAME + } snprintf(atcmd_output, sizeof atcmd_output, msg_fd(fd,1252), // Mob Search... %s %s mob_name, mapindex_id2name(sd->mapindex)); |