From 634aeeb9d58b01f9de6632a014a063ef0c4cf31e Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Fri, 25 Dec 2009 05:00:31 -0500 Subject: Used the "indent" C formatting program from GNU to do some clean ups The command options used was: -nbad -bap -sc -bl -blf -bli0 -cli4 -cbi0 -di5 -nbc -bls -ip2 -nut -ts4 -bap -i4 -sob -npsl --- src/common/mmo.h | 361 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 190 insertions(+), 171 deletions(-) (limited to 'src/common/mmo.h') diff --git a/src/common/mmo.h b/src/common/mmo.h index 1ba3ee4..0e70852 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -5,12 +5,12 @@ #define _MMO_H_ #include -#include "utils.h" // LCCWIN32 +#include "utils.h" // LCCWIN32 #ifdef CYGWIN -#define RETCODE "\r\n" // (CR/LF：Windows系) +#define RETCODE "\r\n" // (CR/LF：Windows系) #else -#define RETCODE "\n" // (LF：Unix系） +#define RETCODE "\n" // (LF：Unix系） #endif #define FIFOSIZE_SERVERLINK 256*1024 @@ -24,7 +24,7 @@ #define MAX_MAP_PER_SERVER 512 #define MAX_INVENTORY 100 #define MAX_AMOUNT 30000 -#define MAX_ZENY 1000000000 // 1G zeny +#define MAX_ZENY 1000000000 // 1G zeny #define MAX_CART 100 #define MAX_SKILL 450 #define GLOBAL_REG_NUM 96 @@ -36,12 +36,12 @@ #define MAX_STORAGE 300 #define MAX_GUILD_STORAGE 1000 #define MAX_PARTY 12 -#define MAX_GUILD 36 // increased max guild members to accomodate for +2 increase for extension levels [Valaris] (removed) [PoW] -#define MAX_GUILDPOSITION 20 // increased max guild positions to accomodate for all members [Valaris] (removed) [PoW] +#define MAX_GUILD 36 // increased max guild members to accomodate for +2 increase for extension levels [Valaris] (removed) [PoW] +#define MAX_GUILDPOSITION 20 // increased max guild positions to accomodate for all members [Valaris] (removed) [PoW] #define MAX_GUILDEXPLUSION 32 #define MAX_GUILDALLIANCE 16 #define MAX_GUILDSKILL 8 -#define MAX_GUILDCASTLE 24 // increased to include novice castles [Valaris] +#define MAX_GUILDCASTLE 24 // increased to include novice castles [Valaris] #define MAX_GUILDLEVEL 50 #define MIN_HAIR_STYLE battle_config.min_hair_style @@ -65,207 +65,226 @@ #define CHAR_CONF_NAME "conf/char_athena.conf" -struct item { - int id; - short nameid; - short amount; - unsigned short equip; - char identify; - char refine; - char attribute; - short card[4]; - short broken; +struct item +{ + int id; + short nameid; + short amount; + unsigned short equip; + char identify; + char refine; + char attribute; + short card[4]; + short broken; }; -struct point{ - char map[24]; - short x,y; +struct point +{ + char map[24]; + short x, y; }; -struct skill { - unsigned short id,lv,flags; +struct skill +{ + unsigned short id, lv, flags; }; -struct global_reg { - char str[32]; - int value; +struct global_reg +{ + char str[32]; + int value; }; -struct mmo_charstatus { - int char_id; - int account_id; - int partner_id; - - int base_exp,job_exp,zeny; - - short class; - short status_point,skill_point; - int hp,max_hp,sp,max_sp; - short option,karma,manner; - short hair,hair_color,clothes_color; - int party_id,guild_id; - - short weapon,shield; - short head_top,head_mid,head_bottom; - - char name[24]; - unsigned char base_level,job_level; - short str,agi,vit,int_,dex,luk; - unsigned char char_num,sex; - - unsigned long mapip; - unsigned int mapport; - - struct point last_point,save_point,memo_point[10]; - struct item inventory[MAX_INVENTORY],cart[MAX_CART]; - struct skill skill[MAX_SKILL]; - int global_reg_num; - struct global_reg global_reg[GLOBAL_REG_NUM]; - int account_reg_num; - struct global_reg account_reg[ACCOUNT_REG_NUM]; - int account_reg2_num; - struct global_reg account_reg2[ACCOUNT_REG2_NUM]; +struct mmo_charstatus +{ + int char_id; + int account_id; + int partner_id; + + int base_exp, job_exp, zeny; + + short class; + short status_point, skill_point; + int hp, max_hp, sp, max_sp; + short option, karma, manner; + short hair, hair_color, clothes_color; + int party_id, guild_id; + + short weapon, shield; + short head_top, head_mid, head_bottom; + + char name[24]; + unsigned char base_level, job_level; + short str, agi, vit, int_, dex, luk; + unsigned char char_num, sex; + + unsigned long mapip; + unsigned int mapport; + + struct point last_point, save_point, memo_point[10]; + struct item inventory[MAX_INVENTORY], cart[MAX_CART]; + struct skill skill[MAX_SKILL]; + int global_reg_num; + struct global_reg global_reg[GLOBAL_REG_NUM]; + int account_reg_num; + struct global_reg account_reg[ACCOUNT_REG_NUM]; + int account_reg2_num; + struct global_reg account_reg2[ACCOUNT_REG2_NUM]; }; -struct storage { - int dirty; - int account_id; - short storage_status; - short storage_amount; - struct item storage_[MAX_STORAGE]; +struct storage +{ + int dirty; + int account_id; + short storage_status; + short storage_amount; + struct item storage_[MAX_STORAGE]; }; -struct guild_storage { - int dirty; - int guild_id; - short storage_status; - short storage_amount; - struct item storage_[MAX_GUILD_STORAGE]; +struct guild_storage +{ + int dirty; + int guild_id; + short storage_status; + short storage_amount; + struct item storage_[MAX_GUILD_STORAGE]; }; struct map_session_data; -struct gm_account { - int account_id; - int level; +struct gm_account +{ + int account_id; + int level; }; -struct party_member { - int account_id; - char name[24],map[24]; - int leader,online,lv; - struct map_session_data *sd; +struct party_member +{ + int account_id; + char name[24], map[24]; + int leader, online, lv; + struct map_session_data *sd; }; -struct party { - int party_id; - char name[24]; - int exp; - int item; - struct party_member member[MAX_PARTY]; +struct party +{ + int party_id; + char name[24]; + int exp; + int item; + struct party_member member[MAX_PARTY]; }; -struct guild_member { - int account_id, char_id; - short hair,hair_color,gender,class,lv; - int exp,exp_payper; - short online,position; - int rsv1,rsv2; - char name[24]; - struct map_session_data *sd; +struct guild_member +{ + int account_id, char_id; + short hair, hair_color, gender, class, lv; + int exp, exp_payper; + short online, position; + int rsv1, rsv2; + char name[24]; + struct map_session_data *sd; }; -struct guild_position { - char name[24]; - int mode; - int exp_mode; +struct guild_position +{ + char name[24]; + int mode; + int exp_mode; }; -struct guild_alliance { - int opposition; - int guild_id; - char name[24]; +struct guild_alliance +{ + int opposition; + int guild_id; + char name[24]; }; -struct guild_explusion { - char name[24]; - char mes[40]; - char acc[40]; - int account_id; - int rsv1,rsv2,rsv3; +struct guild_explusion +{ + char name[24]; + char mes[40]; + char acc[40]; + int account_id; + int rsv1, rsv2, rsv3; }; -struct guild_skill { - int id,lv; +struct guild_skill +{ + int id, lv; }; -struct guild { - int guild_id; - short guild_lv, connect_member, max_member, average_lv; - int exp,next_exp,skill_point,castle_id; - char name[24],master[24]; - struct guild_member member[MAX_GUILD]; - struct guild_position position[MAX_GUILDPOSITION]; - char mes1[60],mes2[120]; - int emblem_len,emblem_id; - char emblem_data[2048]; - struct guild_alliance alliance[MAX_GUILDALLIANCE]; - struct guild_explusion explusion[MAX_GUILDEXPLUSION]; - struct guild_skill skill[MAX_GUILDSKILL]; +struct guild +{ + int guild_id; + short guild_lv, connect_member, max_member, average_lv; + int exp, next_exp, skill_point, castle_id; + char name[24], master[24]; + struct guild_member member[MAX_GUILD]; + struct guild_position position[MAX_GUILDPOSITION]; + char mes1[60], mes2[120]; + int emblem_len, emblem_id; + char emblem_data[2048]; + struct guild_alliance alliance[MAX_GUILDALLIANCE]; + struct guild_explusion explusion[MAX_GUILDEXPLUSION]; + struct guild_skill skill[MAX_GUILDSKILL]; }; -struct guild_castle { - int castle_id; - char map_name[24]; - char castle_name[24]; - char castle_event[24]; - int guild_id; - int economy; - int defense; - int triggerE; - int triggerD; - int nextTime; - int payTime; - int createTime; - int visibleC; - int visibleG0; - int visibleG1; - int visibleG2; - int visibleG3; - int visibleG4; - int visibleG5; - int visibleG6; - int visibleG7; - int Ghp0; // added Guardian HP [Valaris] - int Ghp1; - int Ghp2; - int Ghp3; - int Ghp4; - int Ghp5; - int Ghp6; - int Ghp7; - int GID0; - int GID1; - int GID2; - int GID3; - int GID4; - int GID5; - int GID6; - int GID7; // end addition [Valaris] +struct guild_castle +{ + int castle_id; + char map_name[24]; + char castle_name[24]; + char castle_event[24]; + int guild_id; + int economy; + int defense; + int triggerE; + int triggerD; + int nextTime; + int payTime; + int createTime; + int visibleC; + int visibleG0; + int visibleG1; + int visibleG2; + int visibleG3; + int visibleG4; + int visibleG5; + int visibleG6; + int visibleG7; + int Ghp0; // added Guardian HP [Valaris] + int Ghp1; + int Ghp2; + int Ghp3; + int Ghp4; + int Ghp5; + int Ghp6; + int Ghp7; + int GID0; + int GID1; + int GID2; + int GID3; + int GID4; + int GID5; + int GID6; + int GID7; // end addition [Valaris] }; -struct square { - int val1[5]; - int val2[5]; +struct square +{ + int val1[5]; + int val2[5]; }; -enum { - GBI_EXP =1, // ギルドのEXP - GBI_GUILDLV =2, // ギルドのLv - GBI_SKILLPOINT =3, // ギルドのスキルポイント - GBI_SKILLLV =4, // ギルドスキルLv +enum +{ + GBI_EXP = 1, // ギルドのEXP + GBI_GUILDLV = 2, // ギルドのLv + GBI_SKILLPOINT = 3, // ギルドのスキルポイント + GBI_SKILLLV = 4, // ギルドスキルLv - GMI_POSITION =0, // メンバーの役職変更 - GMI_EXP =1, // メンバーのEXP + GMI_POSITION = 0, // メンバーの役職変更 + GMI_EXP = 1, // メンバーのEXP }; @@ -284,4 +303,4 @@ enum { #endif #endif -#endif // _MMO_H_ +#endif // _MMO_H_ -- cgit v1.2.3-60-g2f50