From 01a1daae3343e0c993de83e7c38fab6a7f5bf5d4 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sat, 8 Jul 2006 17:13:39 +0000 Subject: - Fixed the char table having party/guild_id as smallint when they need int there. Thanks to hermematon for pointing it out (use svn_ugprade7580.sql) - Applied k3dt fixes to pet-hatching, ice-wall check, and wedding skills. - Fixed endow skills calling the skill no damage packet twice. - Fixed a crash on warpwaitingpc when the chat-room is empty. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7580 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index df7519a74..85c67f574 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -906,6 +906,7 @@ int skillnotok (int skillid, struct map_session_data *sd) clif_skill_fail(sd,skillid,0,0); return 1; } + break; case GD_EMERGENCYCALL: if (!battle_config.emergency_call || (map[sd->bl.m].flag.nowarpto && battle_config.emergency_call&1)) @@ -3554,7 +3555,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in sd && sd != dstsd) clif_displaymessage(sd->fd,"You broke target's weapon"); } - clif_skill_nodamage(src,bl,skillid,skilllv,i); break; case PR_ASPERSIO: /* アスペルシオ */ @@ -4909,14 +4909,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case WE_MALE: { int hp_rate=(skilllv <= 0)? 0:skill_db[skillid].hp_rate[skilllv-1]; - int gain_hp= sstatus->max_hp*abs(hp_rate)/100; // The earned is the same % of the target HP than it costed the caster. [Skotlex] + int gain_hp= tstatus->max_hp*abs(hp_rate)/100; // The earned is the same % of the target HP than it costed the caster. [Skotlex] clif_skill_nodamage(src,bl,skillid,status_heal(bl, gain_hp, 0, 0),1); } break; case WE_FEMALE: { int sp_rate=(skilllv <= 0)? 0:skill_db[skillid].sp_rate[skilllv-1]; - int gain_sp=sstatus->max_sp*abs(sp_rate)/100;// The earned is the same % of the target SP than it costed the caster. [Skotlex] + int gain_sp=tstatus->max_sp*abs(sp_rate)/100;// The earned is the same % of the target SP than it costed the caster. [Skotlex] clif_skill_nodamage(src,bl,skillid,status_heal(bl, 0, gain_sp, 0),1); } break; -- cgit v1.2.3-60-g2f50