Prepare to trim skills

1 files changed, 15 insertions, 23 deletions

diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp
index f827427..f363262 100644
--- a/src/map/skill-pools.cpp
+++ b/src/map/skill-pools.cpp
@@ -24,10 +24,10 @@
 #include "memwatch.hpp"
 #endif
 
-int skill_pool_skills[MAX_POOL_SKILLS];
+SkillID skill_pool_skills[MAX_POOL_SKILLS];
 int skill_pool_skills_size = 0;
 
-void skill_pool_register(int id)
+void skill_pool_register(SkillID id)
 {
     if (skill_pool_skills_size + 1 >= MAX_POOL_SKILLS)
     {
@@ -39,21 +39,13 @@ void skill_pool_register(int id)
     skill_pool_skills[skill_pool_skills_size++] = id;
 }
 
-const char *skill_name(int skill)
-{
-    if (skill > 0 && skill < MAX_SKILL_DB)
-        return skill_names[skill].desc;
-    else
-        return NULL;
-}
-
-int skill_pool(struct map_session_data *sd, int *skills)
+int skill_pool(struct map_session_data *sd, SkillID *skills)
 {
     int i, count = 0;
 
     for (i = 0; count < MAX_SKILL_POOL && i < skill_pool_skills_size; i++)
     {
-        int skill_id = skill_pool_skills[i];
+        SkillID skill_id = skill_pool_skills[i];
         if (sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED)
         {
             if (skills)
@@ -71,7 +63,7 @@ void skill_pool_empty(struct map_session_data *sd)
 
     for (i = 0; i < skill_pool_skills_size; i++)
     {
-        int skill_id = skill_pool_skills[i];
+        SkillID skill_id = skill_pool_skills[i];
         sd->status.skill[skill_id].flags = 0;
     }
 }
@@ -86,7 +78,7 @@ int skill_pool_max(struct map_session_data *sd)
     return sd->status.skill[TMW_SKILLPOOL].lv;
 }
 
-int skill_pool_activate(struct map_session_data *sd, int skill_id)
+int skill_pool_activate(struct map_session_data *sd, SkillID skill_id)
 {
     if (sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED)
         return 0;               // Already there
@@ -95,26 +87,26 @@ int skill_pool_activate(struct map_session_data *sd, int skill_id)
     {
         sd->status.skill[skill_id].flags |= SKILL_POOL_ACTIVATED;
         pc_calcstatus(sd, 0);
-        MAP_LOG_PC(sd, "SKILL-ACTIVATE %d %d %d", skill_id,
-                    sd->status.skill[skill_id].lv, skill_power(sd,
-                                                                skill_id));
+        MAP_LOG_PC(sd, "SKILL-ACTIVATE %d %d %d",
+                uint16_t(skill_id), sd->status.skill[skill_id].lv,
+                skill_power(sd, skill_id));
         return 0;
     }
 
     return 1;                   // failed
 }
 
-int skill_pool_is_activated(struct map_session_data *sd, int skill_id)
+int skill_pool_is_activated(struct map_session_data *sd, SkillID skill_id)
 {
     return sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED;
 }
 
-int skill_pool_deactivate(struct map_session_data *sd, int skill_id)
+int skill_pool_deactivate(struct map_session_data *sd, SkillID skill_id)
 {
     if (sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED)
     {
         sd->status.skill[skill_id].flags &= ~SKILL_POOL_ACTIVATED;
-        MAP_LOG_PC(sd, "SKILL-DEACTIVATE %d", skill_id);
+        MAP_LOG_PC(sd, "SKILL-DEACTIVATE %d", uint16_t(skill_id));
         pc_calcstatus(sd, 0);
         return 0;
     }
@@ -122,12 +114,12 @@ int skill_pool_deactivate(struct map_session_data *sd, int skill_id)
     return 1;
 }
 
-int skill_stat(int skill_id)
+int skill_stat(SkillID skill_id)
 {
     return skill_db[skill_id].stat;
 }
 
-int skill_power(struct map_session_data *sd, int skill_id)
+int skill_power(struct map_session_data *sd, SkillID skill_id)
 {
     int stat = skill_stat(skill_id);
     int stat_value, skill_value;
@@ -149,7 +141,7 @@ int skill_power(struct map_session_data *sd, int skill_id)
     return result;
 }
 
-int skill_power_bl(struct block_list *bl, int skill)
+int skill_power_bl(struct block_list *bl, SkillID skill)
 {
     if (bl->type == BL_PC)
         return skill_power((struct map_session_data *) bl, skill);