diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-22 12:27:08 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-22 12:27:08 +0000 |
| commit | ec57a1ffe9c6f065338ff209a218429aff174d20 (patch) | |
| tree | 65b8f3b8bb98c52d38a019bec8d78257ff543654 /src | |
| parent | 68a0cea0ad1247cf3466bf44774187b5aa07d821 (diff) | |
| download | hercules-ec57a1ffe9c6f065338ff209a218429aff174d20.tar.gz hercules-ec57a1ffe9c6f065338ff209a218429aff174d20.tar.bz2 hercules-ec57a1ffe9c6f065338ff209a218429aff174d20.tar.xz hercules-ec57a1ffe9c6f065338ff209a218429aff174d20.zip | |
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@726 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 088d841ae..f5337b846 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5807,7 +5807,7 @@ int clif_hpmeter(struct map_session_data *sd) WBUFW(buf2,8)=(sd->status.max_hp > 0x7fff)? 0x7fff:sd->status.max_hp; for(i=0;i<fd_max;i++){ if(session[i] && (md=session[i]->session_data) && md->state.auth && - md->bl.m == md->bl.m && pc_isGM(md) && sd != md){ + md->bl.m == sd->bl.m && pc_isGM(md) && sd != md){ memcpy(WFIFOP(i,0),buf2,packet_len_table[0x106]); WFIFOSET(i,packet_len_table[0x106]); } diff --git a/src/map/skill.c b/src/map/skill.c index 85f6c6382..28fa8f0ce 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2627,8 +2627,8 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s rate = rate<=5?5:rate; if (sc_data && sc_data[SC_FREEZE].timer != -1) { skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag); - } else if (sd) { - clif_skill_fail(sd,skillid,0,0); + if (sd) + clif_skill_fail(sd,skillid,0,0); break; } damage = skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag); @@ -10024,7 +10024,7 @@ int skill_status_change_start(struct block_list *bl, int type, int val1, int val if(val1>5) //レベルが5以上の場合は25?に制限(1?目はすでに打ってるので-1) val3=5*5-1; else - val3= (val1|1)*(val1|1)-1; + val3= (val1|1)*(val1|1)-1; break; /* スキルじゃない/時間に?係しない */ |