diff options
author | panikon <panikon@zoho.com> | 2014-04-12 02:52:48 -0300 |
---|---|---|
committer | panikon <panikon@zoho.com> | 2014-04-12 02:52:48 -0300 |
commit | 93ebe55b4db88c372436cc755b990453528d3364 (patch) | |
tree | 836b1b59573430c21ea191c4615dbf97cb347bc8 /src/map/npc.c | |
parent | c1f916acdd60282af3838a204e9ec959e1beac12 (diff) | |
parent | f4a566fc7f7bd0e9bbbe01c7341150ba3c12a03f (diff) | |
download | hercules-93ebe55b4db88c372436cc755b990453528d3364.tar.gz hercules-93ebe55b4db88c372436cc755b990453528d3364.tar.bz2 hercules-93ebe55b4db88c372436cc755b990453528d3364.tar.xz hercules-93ebe55b4db88c372436cc755b990453528d3364.zip |
Merge branch 'master' of http://github.com/HerculesWS/Hercules
82af3838a204e9ec959e1beac12.
Diffstat (limited to 'src/map/npc.c')
-rw-r--r-- | src/map/npc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index f872a6170..ae374e961 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1155,8 +1155,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd) // have view ids of mobs to avoid this "issue" [Panikon] if (sd->npc_id != 0) { // The player clicked a npc after entering an OnTouch area - if( sd->areanpc_id == sd->npc_id ); - else + if( sd->areanpc_id != sd->npc_id ) ShowError("npc_click: npc_id != 0\n"); return 1; |