diff options
Diffstat (limited to 'src/map/skill-pools.cpp')
| -rw-r--r-- | src/map/skill-pools.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp index 89bf426..dfc70b0 100644 --- a/src/map/skill-pools.cpp +++ b/src/map/skill-pools.cpp @@ -21,9 +21,12 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. #include "../io/cxxstdio.hpp" -#include "../io/cxxstdio_enums.hpp" + +#include "../mmo/cxxstdio_enums.hpp" #include "battle.hpp" +#include "consts.hpp" +#include "globals.hpp" #include "pc.hpp" #include "../poison.hpp" @@ -31,26 +34,18 @@ namespace tmwa { -Array<SkillID, MAX_POOL_SKILLS> skill_pool_skills; -int skill_pool_skills_size = 0; - +namespace map +{ void skill_pool_register(SkillID id) { - if (skill_pool_skills_size + 1 >= MAX_POOL_SKILLS) - { - FPRINTF(stderr, - "Too many pool skills! Increase MAX_POOL_SKILLS and recompile."_fmt); - return; - } - - skill_pool_skills[skill_pool_skills_size++] = id; + skill_pool_skills.push_back(id); } int skill_pool(dumb_ptr<map_session_data> sd, SkillID *skills) { int i, count = 0; - for (i = 0; count < MAX_SKILL_POOL && i < skill_pool_skills_size; i++) + for (i = 0; count < MAX_SKILL_POOL && i < skill_pool_skills.size(); i++) { SkillID skill_id = skill_pool_skills[i]; if (bool(sd->status.skill[skill_id].flags & SkillFlags::POOL_ACTIVATED)) @@ -147,4 +142,5 @@ int skill_power_bl(dumb_ptr<block_list> bl, SkillID skill) else return 0; } +} // namespace map } // namespace tmwa |