summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-29 04:13:21 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-29 04:13:21 +0000
commit0f706ea86d7972f88c2b7d06dfc35e178911070e (patch)
treeb89bc2d0a2c1e340581b3b70fd1a9aadd31f02ac /src/map/npc.c
parent4db583138b9556f72b13df7f66eeeace6a67ce3e (diff)
downloadhercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.tar.gz
hercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.tar.bz2
hercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.tar.xz
hercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.zip
- Clones can't be class-changed now
- Readded the class == -1 distance check in npc_checknear - Replaced check sd->trade_partner for sd->state.trading in clif.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6356 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 2d890f466..af2ed2c91 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -979,8 +979,8 @@ int npc_checknear(struct map_session_data *sd,int id)
return 1;
}
- //if (nd->class_<0) // イベント系は常にOK
- // return 0;
+ if (nd->class_<0) // イベント系は常にOK
+ return 0;
// エリア判定
if (nd->bl.m!=sd->bl.m ||