From f5bb1621cc8fb3171fe28a9a7c16219fe120f3bb Mon Sep 17 00:00:00 2001 From: ai4rei Date: Thu, 2 Dec 2010 12:08:44 +0000 Subject: * Removed clif_weather_sub and clif_misceffect2 in favor of clif_specialeffect_single and clif_specialeffect (all of them are ZC_NOTIFY_EFFECT2). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14541 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/atcommand.c | 4 ++-- src/map/clif.c | 46 ++++++++++------------------------------------ src/map/clif.h | 1 - src/map/homunculus.c | 6 +++--- src/map/script.c | 6 +++--- src/map/skill.c | 2 +- src/map/unit.c | 2 +- 8 files changed, 21 insertions(+), 47 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 25be24584..f10e1b872 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2010/12/02 + * Removed clif_weather_sub and clif_misceffect2 in favor of clif_specialeffect_single and clif_specialeffect (all of them are ZC_NOTIFY_EFFECT2). [Ai4rei] * Rev. 14540 Monsters spawned with mob-generating items now have MD_ANGRY applied to them. [L0ne_W0lf] 2010/12/01 * Added packet 0x1b1 (ZC_SHOWDIGIT). [Ai4rei] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 59849bc8a..347fbbbac 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6585,7 +6585,7 @@ ACMD_FUNC(summon) md->master_id=sd->bl.id; md->special_state.ai=1; md->deletetimer=add_timer(tick+(duration*60000),mob_timer_delete,md->bl.id,0); - clif_misceffect2(&md->bl,344); + clif_specialeffect(&md->bl,344,AREA); mob_spawn(md); sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000); clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick); @@ -7124,7 +7124,7 @@ ACMD_FUNC(homlevel) } status_calc_homunculus(hd,0); status_percent_heal(&hd->bl, 100, 100); - clif_misceffect2(&hd->bl,568); + clif_specialeffect(&hd->bl,568,AREA); return 0; } diff --git a/src/map/clif.c b/src/map/clif.c index 59e1c4e57..ccfea5a28 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1059,16 +1059,6 @@ static void clif_spiritball_single(int fd, struct map_session_data *sd) WFIFOSET(fd, packet_len(0x1e1)); } -// new and improved weather display [Valaris] -static void clif_weather_sub(int fd, int id, int type) -{ - WFIFOHEAD(fd,packet_len(0x1f3)); - WFIFOW(fd,0) = 0x1f3; - WFIFOL(fd,2) = id; - WFIFOL(fd,6) = type; - WFIFOSET(fd,packet_len(0x1f3)); -} - /*========================================== * *------------------------------------------*/ @@ -1086,24 +1076,24 @@ static void clif_weather_check(struct map_session_data *sd) || map[m].flag.clouds2) { if (map[m].flag.snow) - clif_weather_sub(fd, sd->bl.id, 162); + clif_specialeffect_single(&sd->bl, 162, fd); if (map[m].flag.clouds) - clif_weather_sub(fd, sd->bl.id, 233); + clif_specialeffect_single(&sd->bl, 233, fd); if (map[m].flag.clouds2) - clif_weather_sub(fd, sd->bl.id, 516); + clif_specialeffect_single(&sd->bl, 516, fd); if (map[m].flag.fog) - clif_weather_sub(fd, sd->bl.id, 515); + clif_specialeffect_single(&sd->bl, 515, fd); if (map[m].flag.fireworks) { - clif_weather_sub(fd, sd->bl.id, 297); - clif_weather_sub(fd, sd->bl.id, 299); - clif_weather_sub(fd, sd->bl.id, 301); + clif_specialeffect_single(&sd->bl, 297, fd); + clif_specialeffect_single(&sd->bl, 299, fd); + clif_specialeffect_single(&sd->bl, 301, fd); } if (map[m].flag.sakura) - clif_weather_sub(fd, sd->bl.id, 163); + clif_specialeffect_single(&sd->bl, 163, fd); if (map[m].flag.leaves) - clif_weather_sub(fd, sd->bl.id, 333); + clif_specialeffect_single(&sd->bl, 333, fd); if (map[m].flag.rain) - clif_weather_sub(fd, sd->bl.id, 161); + clif_specialeffect_single(&sd->bl, 161, fd); } } @@ -3089,23 +3079,7 @@ int clif_misceffect(struct block_list* bl,int type) return 0; } -int clif_misceffect2(struct block_list *bl, int type) -{ - unsigned char buf[24]; - - nullpo_ret(bl); - memset(buf, 0, packet_len(0x1f3)); - - WBUFW(buf,0) = 0x1f3; - WBUFL(buf,2) = bl->id; - WBUFL(buf,6) = type; - - clif_send(buf, packet_len(0x1f3), bl, AREA); - - return 0; - -} /*========================================== * 表示オプション変更 *------------------------------------------*/ diff --git a/src/map/clif.h b/src/map/clif.h index a35d22bd6..68e26ac24 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -228,7 +228,6 @@ int clif_statusupack(struct map_session_data *,int,int,int); // self int clif_equipitemack(struct map_session_data *,int,int,int); // self int clif_unequipitemack(struct map_session_data *,int,int,int); // self int clif_misceffect(struct block_list*,int); // area -int clif_misceffect2(struct block_list *bl,int type); int clif_changeoption(struct block_list*); // area int clif_changeoption2(struct block_list*); // area int clif_useitemack(struct map_session_data*,int,int,int); // self diff --git a/src/map/homunculus.c b/src/map/homunculus.c index 0e253e230..0fbd7cbff 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -322,7 +322,7 @@ int merc_hom_evolution(struct homun_data *hd) clif_spawn(&hd->bl); clif_emotion(&sd->bl, E_NO1); - clif_misceffect2(&hd->bl,568); + clif_specialeffect(&hd->bl,568,AREA); //status_Calc flag&1 will make current HP/SP be reloaded from hom structure hom->hp = hd->battle_status.hp; @@ -362,7 +362,7 @@ int merc_hom_gainexp(struct homun_data *hd,int exp) if( hd->exp_next == 0 ) hd->homunculus.exp = 0 ; - clif_misceffect2(&hd->bl,568); + clif_specialeffect(&hd->bl,568,AREA); status_calc_homunculus(hd,0); status_percent_heal(&hd->bl, 100, 100); return 0; @@ -871,7 +871,7 @@ int merc_hom_shuffle(struct homun_data *hd) clif_homskillinfoblock(sd); status_calc_homunculus(hd,0); status_percent_heal(&hd->bl, 100, 100); - clif_misceffect2(&hd->bl,568); + clif_specialeffect(&hd->bl,568,AREA); return 1; } diff --git a/src/map/script.c b/src/map/script.c index e651d4f21..ed07ac07c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10715,11 +10715,11 @@ BUILDIN_FUNC(misceffect) if(st->oid && st->oid != fake_nd->bl.id) { struct block_list *bl = map_id2bl(st->oid); if (bl) - clif_misceffect2(bl,type); + clif_specialeffect(bl,type,AREA); } else{ TBL_PC *sd=script_rid2sd(st); if(sd) - clif_misceffect2(&sd->bl,type); + clif_specialeffect(&sd->bl,type,AREA); } return 0; } @@ -11752,7 +11752,7 @@ BUILDIN_FUNC(summon) delete_timer(md->deletetimer, mob_timer_delete); md->deletetimer = add_timer(tick+(timeout>0?timeout*1000:60000),mob_timer_delete,md->bl.id,0); mob_spawn (md); //Now it is ready for spawning. - clif_misceffect2(&md->bl,344); + clif_specialeffect(&md->bl,344,AREA); sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000); } return 0; diff --git a/src/map/skill.c b/src/map/skill.c index c1c9420e3..b7da7a3c0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5436,7 +5436,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in { //Erase death count 1% of the casts dstsd->die_counter = 0; pc_setglobalreg(dstsd,"PC_DIE_COUNTER", 0); - clif_misceffect2(bl, 0x152); + clif_specialeffect(bl, 0x152, AREA); //SC_SPIRIT invokes status_calc_pc for us. } clif_skill_nodamage(src,bl,skillid,skilllv, diff --git a/src/map/unit.c b/src/map/unit.c index b9a72bc62..df4efef8e 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1798,7 +1798,7 @@ int unit_changeviewsize(struct block_list *bl,short size) } else return 0; if(size!=0) - clif_misceffect2(bl,421+size); + clif_specialeffect(bl,421+size, AREA); return 0; } -- cgit v1.2.3-60-g2f50