summaryrefslogtreecommitdiff
path: root/src/map/pc.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-12-27 06:35:34 +0100
committerHaru <haru@dotalux.com>2015-01-23 04:14:28 +0100
commite778f4f5f1b6a08adee5e7e908a44c38cd29bd12 (patch)
tree63cbc8e6eb78ffc374ffac374bf5e533b58bcafa /src/map/pc.h
parentb1b1b1aa8edc866a83029081e93d3e7d0f138189 (diff)
downloadhercules-e778f4f5f1b6a08adee5e7e908a44c38cd29bd12.tar.gz
hercules-e778f4f5f1b6a08adee5e7e908a44c38cd29bd12.tar.bz2
hercules-e778f4f5f1b6a08adee5e7e908a44c38cd29bd12.tar.xz
hercules-e778f4f5f1b6a08adee5e7e908a44c38cd29bd12.zip
Cleaned up spirit charms implementation (optimized memory and CPU usage)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.h')
-rw-r--r--src/map/pc.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index b7839147d..1785bd4c4 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -366,8 +366,9 @@ struct map_session_data {
short catch_target_class; // pet catching, stores a pet class to catch (short now) [zzo]
short spiritball, spiritball_old;
int spirit_timer[MAX_SPIRITBALL];
- short spiritcharm[SPIRITS_TYPE_END];
- int charm_timer[SPIRITS_TYPE_END][MAX_SPIRITCHARM];
+ short charm_count;
+ int 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
short mission_mobid; //Stores the target mob_id for TK_MISSION
@@ -970,8 +971,8 @@ struct pc_interface {
int (*load_combo) (struct map_session_data *sd);
- int (*add_charm) (struct map_session_data *sd,int interval,int max,int type);
- int (*del_charm) (struct map_session_data *sd,int count,int type);
+ 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 (*baselevelchanged) (struct map_session_data *sd);
int (*level_penalty_mod) (int diff, unsigned char race, unsigned short mode, int type);