diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-03 03:05:43 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-03 03:05:43 +0000 |
| commit | f68bd7c915dc631d452b6ea2ac21cdf75bc26fe4 (patch) | |
| tree | ff8a979363dccf37f3bfb66be4f24cf2d89027e4 /src/map/npc.c | |
| parent | 350416fff4bb9e8bc50b5f8205d04f772e848a92 (diff) | |
| download | hercules-f68bd7c915dc631d452b6ea2ac21cdf75bc26fe4.tar.gz hercules-f68bd7c915dc631d452b6ea2ac21cdf75bc26fe4.tar.bz2 hercules-f68bd7c915dc631d452b6ea2ac21cdf75bc26fe4.tar.xz hercules-f68bd7c915dc631d452b6ea2ac21cdf75bc26fe4.zip | |
- Fixed pc_calc_skilltree ignoring prerequisites / joblvl requirements.
- Re-applied change r9593 that got accidentally reverted by r9595.
- Added the official behavior of monsters regaining full hp when they morph.
- Added support for text/comments at the end of monster spawn lines (<tab> required)
- Silenced the debug message in socket.c that's been freaking people out.
- Modified the useless error message in atcommand_effect.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9608 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 598cc8ee7..7b7557a10 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2228,7 +2228,7 @@ int npc_parse_mob (char *w1, char *w2, char *w3, char *w4) // 引数の個数チェック if (sscanf(w1, "%15[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 || - sscanf(w4, "%d,%d,%u,%u,%49[^\r\n]", &class_, &num, &mob.delay1, &mob.delay2, mob.eventname) < 2 ) { + sscanf(w4, "%d,%d,%u,%u,%49[^\t\r\n]", &class_, &num, &mob.delay1, &mob.delay2, mob.eventname) < 2 ) { ShowError("bad monster line : %s %s %s (file %s)\n", w1, w3, w4, current_file); return 1; } |