Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed a little leftover in socket_enchant2.txt .

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@15665 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
masao87 2012-03-07 23:50:38 +00:00
parent f712811c13
commit 3f33f566f0
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/merchants/socket_enchant2.txt
View File

@ -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 lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86
prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86 prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86
moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86 moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86

2
npc/warps/dungeons/iz_dun.txt
View File

@ -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,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_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,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

3
src/map/clif.c
View File

@ -1321,7 +1321,7 @@ int clif_spawn(struct block_list *bl)
return 0; 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)) if(bl->type == BL_NPC && !((TBL_NPC*)bl)->chat_id && (((TBL_NPC*)bl)->sc.option&OPTION_INVISIBLE))
return 0; return 0;
@ -3966,7 +3966,6 @@ void clif_storageclose(struct map_session_data* sd)
WFIFOW(fd,0) = 0xf8; // Storage Closed WFIFOW(fd,0) = 0xf8; // Storage Closed
WFIFOSET(fd,packet_len(0xf8)); 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 * Server tells 'sd' player client the abouts of 'dstsd' player

1
src/map/clif.h
View File

@ -742,4 +742,5 @@ int clif_autoshadowspell_list(struct map_session_data *sd);
* [RRInd] for the new mounts * [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_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_ */ #endif /* _CLIF_H_ */