diff options
| author | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-07 23:50:38 +0000 |
|---|---|---|
| committer | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-07 23:50:38 +0000 |
| commit | 135ec52fa3accd8a599c5ac006157f4c85428935 (patch) | |
| tree | 91d53fecc2ef4439ddb8db824bc80e8abdd6ec51 | |
| parent | 427c6cd30c0afc6fb965c5a7ffa925508a49d1d1 (diff) | |
| download | hercules-135ec52fa3accd8a599c5ac006157f4c85428935.tar.gz hercules-135ec52fa3accd8a599c5ac006157f4c85428935.tar.bz2 hercules-135ec52fa3accd8a599c5ac006157f4c85428935.tar.xz hercules-135ec52fa3accd8a599c5ac006157f4c85428935.zip | |
- Fixed a little leftover in socket_enchant2.txt .
- Added warp to iz_dun05 bugreport:5395 .
- Fixed a little typo in clif.c .
- Moved "int clif_status_load_single" from clif.c to clif.h .
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15665 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/merchants/socket_enchant2.txt | 2 | ||||
| -rw-r--r-- | npc/warps/dungeons/iz_dun.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 3 | ||||
| -rw-r--r-- | src/map/clif.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index 107d38d5e..aa92f4d22 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -378,7 +378,7 @@ } } -payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86,{ +payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86 lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86 prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86 moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86 diff --git a/npc/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt index 0ccc42db9..ee31f73dd 100644 --- a/npc/warps/dungeons/iz_dun.txt +++ b/npc/warps/dungeons/iz_dun.txt @@ -28,3 +28,5 @@ iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63 iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27 iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328 iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245 +iz_dun04,129,233,0 warp izd07 2,2,iz_dun05,141,187 +iz_dun05,141,190,0 warp izd07-1 2,2,iz_dun04,129,230 diff --git a/src/map/clif.c b/src/map/clif.c index c50dd9ee2..4b5cae43a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1321,7 +1321,7 @@ int clif_spawn(struct block_list *bl) return 0; /** - * Hide NPC from maya puprle card. + * Hide NPC from maya purple card. **/ if(bl->type == BL_NPC && !((TBL_NPC*)bl)->chat_id && (((TBL_NPC*)bl)->sc.option&OPTION_INVISIBLE)) return 0; @@ -3966,7 +3966,6 @@ void clif_storageclose(struct map_session_data* sd) WFIFOW(fd,0) = 0xf8; // Storage Closed WFIFOSET(fd,packet_len(0xf8)); } -int clif_status_load_single(int fd, int id,int type,int flag,int val1, int val2, int val3); /*========================================== * Server tells 'sd' player client the abouts of 'dstsd' player diff --git a/src/map/clif.h b/src/map/clif.h index c03bd388d..583a4e0dd 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -742,4 +742,5 @@ int clif_autoshadowspell_list(struct map_session_data *sd); * [RRInd] for the new mounts **/ int clif_status_load_notick(struct block_list *bl,int type,int flag,int val1, int val2, int val3); +int clif_status_load_single(int fd, int id,int type,int flag,int val1, int val2, int val3); #endif /* _CLIF_H_ */ |