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/homunculus.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/homunculus.h')
-rw-r--r-- | src/map/homunculus.h | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/src/map/homunculus.h b/src/map/homunculus.h index e46420692..d9fbfa9cc 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -8,57 +8,57 @@ #include "unit.h" // struct unit_data struct h_stats { - unsigned int HP, SP; - unsigned short str, agi, vit, int_, dex, luk; + unsigned int HP, SP; + unsigned short str, agi, vit, int_, dex, luk; }; struct s_homunculus_db { - int base_class, evo_class; - char name[NAME_LENGTH]; - struct h_stats base, gmin, gmax, emin, emax; - int foodID ; - int baseASPD ; - long hungryDelay ; - unsigned char element, race, base_size, evo_size; + int base_class, evo_class; + char name[NAME_LENGTH]; + struct h_stats base, gmin, gmax, emin, emax; + int foodID ; + int baseASPD ; + long hungryDelay ; + unsigned char element, race, base_size, evo_size; }; extern struct s_homunculus_db homunculus_db[MAX_HOMUNCULUS_CLASS]; enum { HOMUNCULUS_CLASS, HOMUNCULUS_FOOD }; enum { - SP_ACK = 0x0, - SP_INTIMATE = 0x1, - SP_HUNGRY = 0x2, + SP_ACK = 0x0, + SP_INTIMATE = 0x1, + SP_HUNGRY = 0x2, }; struct homun_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_homunculus_db *homunculusDB; //[orn] - struct s_homunculus homunculus; //[orn] - - struct map_session_data *master; //pointer back to its master - int hungry_timer; //[orn] - unsigned int exp_next; - char blockskill[MAX_SKILL]; // [orn] - + 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_homunculus_db *homunculusDB; //[orn] + struct s_homunculus homunculus; //[orn] + + struct map_session_data *master; //pointer back to its master + int hungry_timer; //[orn] + unsigned int exp_next; + char blockskill[MAX_SKILL]; // [orn] + int spiritball; //for homun S [lighta] }; #define MAX_HOM_SKILL_REQUIRE 5 struct homun_skill_tree_entry { - short id; - unsigned char max; - unsigned char joblv; - short intimacylv; - struct { - short id; - unsigned char lv; - } need[MAX_HOM_SKILL_REQUIRE]; + short id; + unsigned char max; + unsigned char joblv; + short intimacylv; + struct { + short id; + unsigned char lv; + } need[MAX_HOM_SKILL_REQUIRE]; }; // Celest #define HOM_EVO 0x100 //256 @@ -67,22 +67,22 @@ struct homun_skill_tree_entry { #define HOM_REG 0x1000 //4096 enum { -// Normal Homunculus - MAPID_LIF = HOM_REG|0x0, - MAPID_AMISTR, - MAPID_FILIR, - MAPID_VANILMIRTH, -// Evolved Homunulus - MAPID_LIF_E = HOM_REG|HOM_EVO|0x0, - MAPID_AMISTR_E, - MAPID_FILIR_E, - MAPID_VANILMIRTH_E, -// Homunculus S - MAPID_EIRA = HOM_S|0x0, - MAPID_BAYERI, - MAPID_SERA, - MAPID_DIETER, - MAPID_ELANOR, + // Normal Homunculus + MAPID_LIF = HOM_REG|0x0, + MAPID_AMISTR, + MAPID_FILIR, + MAPID_VANILMIRTH, + // Evolved Homunulus + MAPID_LIF_E = HOM_REG|HOM_EVO|0x0, + MAPID_AMISTR_E, + MAPID_FILIR_E, + MAPID_VANILMIRTH_E, + // Homunculus S + MAPID_EIRA = HOM_S|0x0, + MAPID_BAYERI, + MAPID_SERA, + MAPID_DIETER, + MAPID_ELANOR, }; #define homdb_checkid(id) (id >= HM_CLASS_BASE && id <= HM_CLASS_MAX) @@ -91,7 +91,7 @@ enum { #define merc_is_hom_active(x) (x && x->homunculus.vaporize != 1 && x->battle_status.hp > 0) int do_init_merc(void); int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag); //albator -struct view_data* merc_get_hom_viewdata(int class_); +struct view_data *merc_get_hom_viewdata(int class_); int hom_class2mapid(int hom_class); void merc_damage(struct homun_data *hd); int merc_hom_dead(struct homun_data *hd); @@ -116,13 +116,13 @@ int merc_menu(struct map_session_data *sd,int menunum); int merc_hom_food(struct map_session_data *sd, struct homun_data *hd); int merc_hom_hungry_timer_delete(struct homun_data *hd); int merc_hom_change_name(struct map_session_data *sd,char *name); -int merc_hom_change_name_ack(struct map_session_data *sd, char* name, int flag); +int merc_hom_change_name_ack(struct map_session_data *sd, char *name, int flag); #define merc_stop_walking(hd, type) unit_stop_walking(&(hd)->bl, type) #define merc_stop_attack(hd) unit_stop_attack(&(hd)->bl) -int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value); -int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value); +int merc_hom_increase_intimacy(struct homun_data *hd, unsigned int value); +int merc_hom_decrease_intimacy(struct homun_data *hd, unsigned int value); int merc_skill_tree_get_max(int id, int b_class); -void merc_hom_init_timers(struct homun_data * hd); +void merc_hom_init_timers(struct homun_data *hd); void merc_skill_reload(void); void merc_reload(void); |