summaryrefslogtreecommitdiff
path: root/src/map/mob.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mob.c')
-rw-r--r--src/map/mob.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index a016a825a..f462b9aa8 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -623,12 +623,14 @@ int mob_spawn (struct mob_data *md)
else if (md->vd->class_ != md->class_) {
status_set_viewdata(&md->bl, md->class_);
md->db = mob_db(md->class_);
- if (md->spawn)
- memcpy(md->name,md->spawn->name,NAME_LENGTH);
- else if (battle_config.override_mob_names == 1)
- memcpy(md->name,md->db->name,NAME_LENGTH);
- else
- memcpy(md->name,md->db->jname,NAME_LENGTH);
+ if (md->spawn)
+ memcpy(md->name,md->spawn->name,NAME_LENGTH);
+ // Redundant? mob_parse_dataset already have the name copied. [Lance]
+ /*else if (battle_config.override_mob_names == 1)
+ memcpy(md->name,md->db->name,NAME_LENGTH);
+ else
+ memcpy(md->name,md->db->jname,NAME_LENGTH);*/
+ }
}
if (md->spawn) { //Respawn data