From e81fad940ac591a6a76ecd0aa0b1d26cff688705 Mon Sep 17 00:00:00 2001 From: glighta Date: Sun, 30 Dec 2012 16:00:24 +0000 Subject: -Harmonize skillid, skill_num, skillnum, skill, to skill_id and same for skill_lv -Optimise type from int to int16 in order to reduce ram consumtion. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17065 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/elemental.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/map/elemental.h') diff --git a/src/map/elemental.h b/src/map/elemental.h index ce8818563..f941f3dfd 100644 --- a/src/map/elemental.h +++ b/src/map/elemental.h @@ -43,14 +43,14 @@ struct elemental_data { struct status_data base_status, battle_status; struct status_change sc; struct regen_data regen; - + struct s_elemental_db *db; struct s_elemental elemental; - + struct map_session_data *master; int summon_timer; int skill_timer; - + unsigned last_thinktime, last_linktime, last_spdrain_time; short min_chase; int target_id, attacked_id; @@ -75,12 +75,12 @@ void elemental_summon_stop(struct elemental_data *ed); int elemental_get_lifetime(struct elemental_data *ed); int elemental_unlocktarget(struct elemental_data *ed); -int elemental_skillnotok(int skillid, struct elemental_data *ed); +int elemental_skillnotok(uint16 skill_id, struct elemental_data *ed); int elemental_set_target( struct map_session_data *sd, struct block_list *bl ); -int elemental_clean_single_effect(struct elemental_data *ed, int skill_num); +int elemental_clean_single_effect(struct elemental_data *ed, uint16 skill_id); int elemental_clean_effect(struct elemental_data *ed); int elemental_action(struct elemental_data *ed, struct block_list *bl, unsigned int tick); -struct skill_condition elemental_skill_get_requirements(int skill, int lv); +struct skill_condition elemental_skill_get_requirements(uint16 skill_id, uint16 skill_lv); #define elemental_stop_walking(ed, type) unit_stop_walking(&(ed)->bl, type) #define elemental_stop_attack(ed) unit_stop_attack(&(ed)->bl) -- cgit v1.2.3-60-g2f50