diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-23 15:43:40 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-23 15:43:40 +0000 |
| commit | 0d5eb7540f191170701a32f8f53d9f24e1b2268f (patch) | |
| tree | 957e8f4934cbd1dcb0965a15b417dc3dae3a4320 /src/map/npc.c | |
| parent | feb18879f7adaae475cd4435252eb399ee5a185e (diff) | |
| download | hercules-0d5eb7540f191170701a32f8f53d9f24e1b2268f.tar.gz hercules-0d5eb7540f191170701a32f8f53d9f24e1b2268f.tar.bz2 hercules-0d5eb7540f191170701a32f8f53d9f24e1b2268f.tar.xz hercules-0d5eb7540f191170701a32f8f53d9f24e1b2268f.zip | |
- the charname request hack message has been downgraded to only include GM-invisible characters.
- corrected clif_charnameack to send negative ID when a disguised player asks for it's own disguised name.
- Cleaned up the disguised target-id checks taking into considering that the only character that sees a negative ID is the same disguised character.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6715 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 953eccc27..5bded2f3c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -985,12 +985,13 @@ int npc_checknear(struct map_session_data *sd,int id) return 0;
nd=(struct npc_data *)map_id2bl(id);
- if (nd==NULL || nd->bl.type!=BL_NPC) {
+ if (nd==NULL) {
if (battle_config.error_log)
ShowWarning("no such npc : %d\n",id);
return 1;
}
-
+ if (nd->bl.type!=BL_NPC) //Disguised character or something else...
+ return 1;
if (nd->class_<0) // イベント系は常にOK
return 0;
|