From 30335063bff54c2b4782689eebdb3b2717e878fa Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 1 Mar 2013 11:45:15 -0800 Subject: Convince skills to work --- src/map/skill-pools.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/skill-pools.cpp') diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp index 9c0ea8b..c225ebe 100644 --- a/src/map/skill-pools.cpp +++ b/src/map/skill-pools.cpp @@ -54,13 +54,13 @@ int skill_pool_activate(struct map_session_data *sd, SkillID skill_id) { if (bool(sd->status.skill[skill_id].flags & SkillFlags::POOL_ACTIVATED)) return 0; // Already there - else if (sd->status.skill[skill_id].id == skill_id // knows the skill + else if (sd->status.skill[skill_id].lv && (skill_pool_size(sd) < skill_pool_max(sd))) { sd->status.skill[skill_id].flags |= SkillFlags::POOL_ACTIVATED; pc_calcstatus(sd, 0); MAP_LOG_PC(sd, "SKILL-ACTIVATE %d %d %d", - uint16_t(skill_id), sd->status.skill[skill_id].lv, + skill_id, sd->status.skill[skill_id].lv, skill_power(sd, skill_id)); return 0; } @@ -78,7 +78,7 @@ int skill_pool_deactivate(struct map_session_data *sd, SkillID skill_id) if (bool(sd->status.skill[skill_id].flags & SkillFlags::POOL_ACTIVATED)) { sd->status.skill[skill_id].flags &= ~SkillFlags::POOL_ACTIVATED; - MAP_LOG_PC(sd, "SKILL-DEACTIVATE %d", uint16_t(skill_id)); + MAP_LOG_PC(sd, "SKILL-DEACTIVATE %d", skill_id); pc_calcstatus(sd, 0); return 0; } -- cgit v1.2.3-70-g09d2