From 1b73b82ea629ff1e69fc2d6094c27e9e32229a84 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 7 Nov 2006 16:17:01 +0000 Subject: - Fixed map_foreachiddb and map_foreachpc so they don't encapsulate the variable arguments into a double va_arg list. Thanks to the Ultra Mage for the tip. - Cleaned up the clif_hate/mob_info functions with the correct fields/usage as explained by Rayce. - Implemented clif_feel_hate_reset packet to properly display the Angel of the Sun/Moon/Stars, thanks again to Rayce for the relevant information. - LP will again block all land-stuff from being placed down on top of it for the exception of Song/Dance/Encores. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9162 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index a90e179ce..ea9f44c4f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3789,7 +3789,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if (sd) { int id; if (sd->mission_mobid && (sd->mission_count || rand()%100)) { //Cannot change target when already have one - clif_mission_mob(sd, sd->mission_mobid, sd->mission_count); + clif_mission_info(sd, sd->mission_mobid, sd->mission_count); clif_skill_fail(sd,skillid,0,0); break; } @@ -3801,7 +3801,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in sd->mission_mobid = id; sd->mission_count = 0; pc_setglobalreg(sd,"TK_MISSION_ID", id); - clif_mission_mob(sd, id, 0); + clif_mission_info(sd, id, 0); clif_skill_nodamage(src,bl,skillid,skilllv,1); } break; @@ -5411,7 +5411,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if(!sd->feel_map[skilllv-1].index) clif_parse_ReqFeel(sd->fd,sd, skilllv); else - clif_feel_info(sd, skilllv-1); + clif_feel_info(sd, skilllv-1, 1); } break; @@ -9333,9 +9333,8 @@ int skill_landprotector (struct block_list *bl, va_list ap) break; } if (unit->group->skill_id == SA_LANDPROTECTOR && - skill_get_type(skillid) == BF_MAGIC) -// !(skill_get_unit_flag(skillid)&(UF_DANCE|UF_SONG|UF_ENSEMBLE))) - { //When LP is already placed, all it does it prevent magic spells from being placed. + !(skill_get_unit_flag(skillid)&(UF_DANCE|UF_SONG|UF_ENSEMBLE))) + { //Block stuff from being placed on an LP except for song/dances (*alive) = 0; return 1; } -- cgit v1.2.3-60-g2f50