diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-27 15:45:24 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-27 15:45:24 +0000 |
| commit | 16abeeb177d89233c17423701be7912469e9c02d (patch) | |
| tree | 4c0f030ce9927d417614bfdcc0ceab0eb52176e8 | |
| parent | e3c085cff4a933d04bd7869a1054d2b7072e1ba7 (diff) | |
| download | hercules-16abeeb177d89233c17423701be7912469e9c02d.tar.gz hercules-16abeeb177d89233c17423701be7912469e9c02d.tar.bz2 hercules-16abeeb177d89233c17423701be7912469e9c02d.tar.xz hercules-16abeeb177d89233c17423701be7912469e9c02d.zip | |
Fixed a typo in r11505 messing up the 'npcmove' command (only 'x' coordinate was being set correctly)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11588 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1a66c3845..3f841bf17 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/10/27 + * Fixed a typo in r11505 messing up the 'npcmove' command * Removed 'petid', a command from r284 to look up pet ids by name * Fixed TXT charserver doing periodic random-sized alloc (bugreport:312) * Set 'Create Converter's produce success rate to 100% (bugreport:302) diff --git a/src/map/npc.c b/src/map/npc.c index 457711255..25b928b10 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1985,7 +1985,7 @@ void npc_movenpc(struct npc_data* nd, int x, int y) if (m < 0 || nd->bl.prev == NULL) return; //Not on a map. x = cap_value(x, 0, map[m].xs-1); - x = cap_value(y, 0, map[m].ys-1); + y = cap_value(y, 0, map[m].ys-1); npc_unsetcells(nd); map_foreachinrange(clif_outsight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl); |