diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 7 | ||||
| -rw-r--r-- | src/map/clif.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 58661057b..f33a286b7 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7370,7 +7370,7 @@ void clif_wedding_effect(struct block_list *bl) } /*========================================== * ?なたに逢いたい使用時名前叫び - *------------------------------------------ + *------------------------------------------*/ void clif_callpartner(struct map_session_data *sd) { @@ -7385,15 +7385,12 @@ void clif_callpartner(struct map_session_data *sd) if(p){ memcpy(WBUFP(buf,2),p,NAME_LENGTH); }else{ - map_reqchariddb(sd,sd->status.partner_id); - chrif_searchcharid(sd->status.partner_id); WBUFB(buf,2) = 0; } clif_send(buf,packet_len(0x1e6),&sd->bl,AREA); } - return; } -*/ + /*========================================== * Marry [DracoRPG] diff --git a/src/map/clif.h b/src/map/clif.h index 68f36dc59..035052256 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -156,7 +156,7 @@ void clif_emotion(struct block_list *bl,int type); void clif_talkiebox(struct block_list* bl, const char* talkie); void clif_wedding_effect(struct block_list *bl); void clif_divorced(struct map_session_data* sd, const char* name); -//void clif_callpartner(struct map_session_data *sd); +void clif_callpartner(struct map_session_data *sd); void clif_playBGM(struct map_session_data* sd, struct block_list* bl, const char* name); void clif_soundeffect(struct map_session_data* sd, struct block_list* bl, const char* name, int type); int clif_soundeffectall(struct block_list* bl, const char *name, int type, enum send_target coverage); diff --git a/src/map/skill.c b/src/map/skill.c index 2f1f9240e..ac6591cad 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4760,7 +4760,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case SC_JEXPBOOST: case SC_INVINCIBLE: case SC_INVINCIBLEOFF: case SC_HELLPOWER: case SC_MANU_ATK: case SC_MANU_DEF: case SC_SPL_ATK: case SC_SPL_DEF: case SC_MANU_MATK: - case SC_SPL_MATK: + case SC_SPL_MATK: case SC_RICHMANKIM: case SC_ETERNALCHAOS: + case SC_DRUMBATTLE: case SC_NIBELUNGEN: case SC_ROKISWEIL: + case SC_INTOABYSS: case SC_SIEGFRIED: case SC_WHISTLE: + case SC_ASSNCROS: case SC_POEMBRAGI: case SC_APPLEIDUN: + case SC_HUMMING: case SC_DONTFORGETME: case SC_FORTUNE: + case SC_SERVICE4U: continue; case SC_ASSUMPTIO: if( bl->type == BL_MOB ) @@ -5828,6 +5833,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data) switch (ud->skillid) { //These should become skill_castend_pos case WE_CALLPARTNER: + if(sd) clif_callpartner(sd); case WE_CALLPARENT: case WE_CALLBABY: case AM_RESURRECTHOMUN: |