diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-04-14 01:44:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2020-05-04 01:00:43 +0300 |
| commit | e2808832a99ccd675825935b4a81c962a35d5e10 (patch) | |
| tree | e140d3384159be98c0b9cf2635e9264f8a3cc532 | |
| parent | b996dec80009b227b643f794fd69e3e78a0d5291 (diff) | |
| download | hercules-e2808832a99ccd675825935b4a81c962a35d5e10.tar.gz hercules-e2808832a99ccd675825935b4a81c962a35d5e10.tar.bz2 hercules-e2808832a99ccd675825935b4a81c962a35d5e10.tar.xz hercules-e2808832a99ccd675825935b4a81c962a35d5e10.zip | |
Use enum spirit_charm_types for charm type field
| -rw-r--r-- | src/map/pc.c | 4 | ||||
| -rw-r--r-- | src/map/pc.h | 6 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index a8ed4430e..06ab57e0e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -11328,7 +11328,7 @@ static int pc_charm_timer(int tid, int64 tick, int id, intptr_t data) * @param max Maximum amount of charms to add. * @param type Charm type (@see spirit_charm_types) */ -static void pc_add_charm(struct map_session_data *sd, int interval, int max, int type) +static void pc_add_charm(struct map_session_data *sd, int interval, int max, enum spirit_charm_types type) { int tid, i; @@ -11370,7 +11370,7 @@ static void pc_add_charm(struct map_session_data *sd, int interval, int max, int * @param count Amount of charms to remove. * @param type Type of charm to remove. */ -static void pc_del_charm(struct map_session_data *sd, int count, int type) +static void pc_del_charm(struct map_session_data *sd, int count, enum spirit_charm_types type) { int i; diff --git a/src/map/pc.h b/src/map/pc.h index 6b2b44e2a..728c91669 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -439,7 +439,7 @@ END_ZEROED_BLOCK; int spiritball, spiritball_old; int spirit_timer[MAX_SPIRITBALL]; int charm_count; - int charm_type; + enum spirit_charm_types charm_type; int charm_timer[MAX_SPIRITCHARM]; unsigned char potion_success_counter; //Potion successes in row counter unsigned char mission_count; //Stores the bounty kill count for TK_MISSION @@ -1129,8 +1129,8 @@ END_ZEROED_BLOCK; /* End */ int (*load_combo) (struct map_session_data *sd); - void (*add_charm) (struct map_session_data *sd, int interval, int max, int type); - void (*del_charm) (struct map_session_data *sd, int count, int type); + void (*add_charm) (struct map_session_data *sd, int interval, int max, enum spirit_charm_types type); + void (*del_charm) (struct map_session_data *sd, int count, enum spirit_charm_types type); void (*baselevelchanged) (struct map_session_data *sd); int (*level_penalty_mod) (int diff, unsigned char race, uint32 mode, int type); diff --git a/src/map/skill.c b/src/map/skill.c index 1222cf940..ca90a7672 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -10470,7 +10470,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * case KO_KAZEHU_SEIRAN: case KO_DOHU_KOUKAI: if(sd) { - int ttype = skill->get_ele(skill_id, skill_lv); + enum spirit_charm_types ttype = skill->get_ele(skill_id, skill_lv); clif->skill_nodamage(src, bl, skill_id, skill_lv, 1); pc->add_charm(sd, skill->get_time(skill_id, skill_lv), MAX_SPIRITCHARM, ttype); // replace existing charms of other type } |