diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-06-03 14:43:34 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-06-03 14:43:34 +0000 |
| commit | 89d430b2c4d770d7d5c073710a21bd24df5f3f0c (patch) | |
| tree | e5f93768098ffc862b279316dc20c78d7c96835d /src/map/npc.c | |
| parent | 85db2023cb033928a190ac7fa6f05b5d6cbad14a (diff) | |
| download | hercules-89d430b2c4d770d7d5c073710a21bd24df5f3f0c.tar.gz hercules-89d430b2c4d770d7d5c073710a21bd24df5f3f0c.tar.bz2 hercules-89d430b2c4d770d7d5c073710a21bd24df5f3f0c.tar.xz hercules-89d430b2c4d770d7d5c073710a21bd24df5f3f0c.zip | |
- Fixed missing client update when 'return to savepoint' fails
- Fixed a bad copy-paste from r10028 letting players escape jail (char was dead on login, so statuses (SC_JAILED) couln't be applied)
- Added clif_standing() to clif_sitting(), and used them in clif.c
- Cleaned up clif.c a bit - clif_clearchar->clif_clearunit_area, clif_clearchar_id->clif_clearunit_single
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10668 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 03ef54007..2afd9421b 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -126,7 +126,7 @@ int npc_enable(const char* name, int flag) if (nd->class_ == WARP_CLASS || nd->class_ == FLAG_CLASS) { //Client won't display option changes for these classes [Toms] if (nd->sc.option&(OPTION_HIDE|OPTION_INVISIBLE)) - clif_clearchar(&nd->bl, 0); + clif_clearunit_area(&nd->bl, 0); else clif_spawn(&nd->bl); } else @@ -156,7 +156,7 @@ int npc_event_dequeue(struct map_session_data* sd) if(sd->npc_id) { //Current script is aborted. if(sd->state.using_fake_npc){ - clif_clearchar_id(sd->npc_id, 0, sd->fd); + clif_clearunit_single(sd->npc_id, 0, sd->fd); sd->state.using_fake_npc = 0; } if (sd->st) { @@ -1443,7 +1443,7 @@ int npc_remove_map(struct npc_data* nd) #ifdef PCRE_SUPPORT npc_chat_finalize(nd); #endif - clif_clearchar_area(&nd->bl,2); + clif_clearunit_area(&nd->bl,2); strdb_remove(npcname_db, (nd->bl.subtype < SCRIPT) ? nd->name : nd->exname); //Remove corresponding NPC CELLs if (nd->bl.subtype == WARP) { |