diff options
| author | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-25 21:20:43 +0000 |
|---|---|---|
| committer | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-25 21:20:43 +0000 |
| commit | b11bf6e1604097711291265f927e79e8f2af5c54 (patch) | |
| tree | 6eac67dfe94b2cef4e48f59c1bf448a321ce24cd /src/map/elemental.h | |
| parent | d9c5c4784a0abc43fb9e01f365a0d8b3a15a0692 (diff) | |
| download | hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.gz hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.bz2 hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.xz hercules-b11bf6e1604097711291265f927e79e8f2af5c54.zip | |
Applied AStyle code formating as discussed on tid:74602.
Removed /SAFESEH option from MSVC11 projects.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/elemental.h')
| -rw-r--r-- | src/map/elemental.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/map/elemental.h b/src/map/elemental.h index 1f99bcba9..221ae3b9f 100644 --- a/src/map/elemental.h +++ b/src/map/elemental.h @@ -20,44 +20,44 @@ #define EL_SKILLMODE_AGGRESSIVE 0x4 struct elemental_skill { - unsigned short id, lv; - short mode; + unsigned short id, lv; + short mode; }; struct s_elemental_db { - int class_; - char sprite[NAME_LENGTH], name[NAME_LENGTH]; - unsigned short lv; - short range2, range3; - struct status_data status; - struct view_data vd; - struct elemental_skill skill[MAX_ELESKILLTREE]; + int class_; + char sprite[NAME_LENGTH], name[NAME_LENGTH]; + unsigned short lv; + short range2, range3; + struct status_data status; + struct view_data vd; + struct elemental_skill skill[MAX_ELESKILLTREE]; }; extern struct s_elemental_db elemental_db[MAX_ELEMENTAL_CLASS]; struct elemental_data { - struct block_list bl; - struct unit_data ud; - struct view_data *vd; - 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; - short min_chase; - int target_id, attacked_id; + struct block_list bl; + struct unit_data ud; + struct view_data *vd; + 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; + short min_chase; + int target_id, attacked_id; }; bool elemental_class(int class_); -struct view_data * elemental_get_viewdata(int class_); +struct view_data *elemental_get_viewdata(int class_); int elemental_create(struct map_session_data *sd, int class_, unsigned int lifetime); int elemental_data_received(struct s_elemental *ele, bool flag); @@ -76,7 +76,7 @@ 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_set_target( struct map_session_data *sd, struct block_list *bl ); +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_effect(struct elemental_data *ed); int elemental_action(struct elemental_data *ed, struct block_list *bl, unsigned int tick); |