summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-14 05:40:02 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-14 05:40:02 +0000
commitb4d6d1d59351505a52cce0d5c53d542b83016ad0 (patch)
treefdf7cb39f6926377bc559cc5bb15b7a68108cacb
parenta657a1fd0f2cdb92d6c5649ad1dbb0f91548d7f7 (diff)
downloadhercules-b4d6d1d59351505a52cce0d5c53d542b83016ad0.tar.gz
hercules-b4d6d1d59351505a52cce0d5c53d542b83016ad0.tar.bz2
hercules-b4d6d1d59351505a52cce0d5c53d542b83016ad0.tar.xz
hercules-b4d6d1d59351505a52cce0d5c53d542b83016ad0.zip
Fixed problem with OnTouch on NPC ID 139, blame on r14993, bugreport:5206
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15441 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/npc.c2
-rw-r--r--src/map/npc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index a17f83df7..026e61c0d 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -96,7 +96,7 @@ static struct script_event_s
struct view_data* npc_get_viewdata(int class_)
{ //Returns the viewdata for normal npc classes.
- if( class_ == HIDDEN_WARP_CLASS || class_ == INVISIBLE_CLASS )
+ if( class_ == INVISIBLE_CLASS )
return &npc_viewdb[0];
if (npcdb_checkid(class_) || class_ == WARP_CLASS)
return &npc_viewdb[class_];
diff --git a/src/map/npc.h b/src/map/npc.h
index 5911a338d..5e5bcb41a 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -72,7 +72,7 @@ struct npc_data {
enum actor_classes
{
WARP_CLASS = 45,
- HIDDEN_WARP_CLASS = 139, // server-side only, never sent to client
+ HIDDEN_WARP_CLASS = 139,
WARP_DEBUG_CLASS = 722,
FLAG_CLASS = 722,
INVISIBLE_CLASS = 32767,