- Merged a fix from Herculus which is supposed to fix the Taekwon Ranker skill tree problem (bugreport:7327)

- Fixed the order of parameters in a nullpo_retr call (bugreport:7402)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17207 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
playtester 2013-03-23 16:06:22 +00:00
parent afd58bbb45
commit a15ec01109
2 changed files with 2 additions and 2 deletions

View File

@ -1437,7 +1437,7 @@ int pc_calc_skilltree(struct map_session_data *sd)
sd->status.skill[id].id = id;
sd->status.skill[id].flag = SKILL_FLAG_TEMPORARY; // So it is not saved, and tagged as a "bonus" skill.
}
else
else if( id != NV_BASIC)
{
sd->status.skill[id].flag = SKILL_FLAG_REPLACED_LV_0 + sd->status.skill[id].lv; // Remember original level
}

View File

@ -6210,7 +6210,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti
struct map_session_data *sd;
nullpo_ret(bl);
nullpo_retr(src, tick?tick:1); //If no source, it can't be resisted (NPC given)
nullpo_retr(tick?tick:1, src); //If no source, it can't be resisted (NPC given)
//Status that are blocked by Golden Thief Bug card or Wand of Hermod
if (status_isimmune(bl))