summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-24 17:46:16 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-24 17:46:16 +0000
commitd719a7dcec9a7f99c7c945f3d4effa386b102bab (patch)
treecc06514d11a5d25f2dd741ea1a9b781c512a87f4 /src/map/npc.c
parentf753f361a3fabcb9b14746ead47dac7e9a0d8ab7 (diff)
downloadhercules-d719a7dcec9a7f99c7c945f3d4effa386b102bab.tar.gz
hercules-d719a7dcec9a7f99c7c945f3d4effa386b102bab.tar.bz2
hercules-d719a7dcec9a7f99c7c945f3d4effa386b102bab.tar.xz
hercules-d719a7dcec9a7f99c7c945f3d4effa386b102bab.zip
- Cleaned up @grind2
- Updated @monsterbig, @monstersmall to use the event 2 and 4 rather than the max_mob_db code check. - Modified override_mobs_names to work only on the mob spawn files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6252 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 038c2804c..92d36d9c4 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2175,7 +2175,17 @@ int npc_parse_mob (char *w1, char *w2, char *w3, char *w4)
return 1;
}
+ //Use db names instead of the spawn file ones.
+ if(battle_config.override_mob_names==1)
+ strcpy(mob.name,"--en--");
+ else if (battle_config.override_mob_names==2)
+ strcpy(mob.name,"--ja--");
+ else
+ strncpy(data->name,mob_db(data->class_)->jname,NAME_LENGTH-1);
+
+
strncpy(mob.name, mobname, NAME_LENGTH-1);
+
if (!mob_parse_dataset(&mob)) //Verify dataset.
return 1;