diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 02:53:33 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 02:53:33 +0000 |
| commit | 60a426c0742b3e7d8c5b557c7578df6eeeea377b (patch) | |
| tree | 5d01f9ccc2798309f9b13f07c0096ed97c6a85c8 /src/map/guild.h | |
| parent | 621db2441f69736a6c8f10d26bf966d5414fac74 (diff) | |
| download | hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.tar.gz hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.tar.bz2 hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.tar.xz hercules-60a426c0742b3e7d8c5b557c7578df6eeeea377b.zip | |
- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
[16969:16991/trunk/src/] will be re-committed in the next 24 hours.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.h')
| -rw-r--r-- | src/map/guild.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/map/guild.h b/src/map/guild.h index ecae8a30e..3e7b98f59 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -15,12 +15,12 @@ struct mob_data; //For quick linking to a guardian's info. [Skotlex] struct guardian_data { - int number; //0-MAX_GUARDIANS-1 = Guardians. MAX_GUARDIANS = Emperium. - int guild_id; - int emblem_id; - int guardup_lv; //Level of GD_GUARDUP skill. - char guild_name[NAME_LENGTH]; - struct guild_castle *castle; + int number; //0-MAX_GUARDIANS-1 = Guardians. MAX_GUARDIANS = Emperium. + int guild_id; + int emblem_id; + int guardup_lv; //Level of GD_GUARDUP skill. + char guild_name[NAME_LENGTH]; + struct guild_castle* castle; }; int guild_skill_get_max(int id); @@ -35,8 +35,8 @@ struct guild *guild_search(int guild_id); struct guild *guild_searchname(char *str); struct guild_castle *guild_castle_search(int gcid); -struct guild_castle *guild_mapname2gc(const char *mapname); -struct guild_castle *guild_mapindex2gc(short mapindex); +struct guild_castle* guild_mapname2gc(const char* mapname); +struct guild_castle* guild_mapindex2gc(short mapindex); struct map_session_data *guild_getavailablesd(struct guild *g); int guild_getindex(struct guild *g,int account_id,int char_id); @@ -55,18 +55,18 @@ int guild_reply_invite(struct map_session_data *sd,int guild_id,int flag); void guild_member_joined(struct map_session_data *sd); int guild_member_added(int guild_id,int account_id,int char_id,int flag); int guild_leave(struct map_session_data *sd,int guild_id, - int account_id,int char_id,const char *mes); + int account_id,int char_id,const char *mes); int guild_member_withdraw(int guild_id,int account_id,int char_id,int flag, - const char *name,const char *mes); + const char *name,const char *mes); int guild_expulsion(struct map_session_data *sd,int guild_id, - int account_id,int char_id,const char *mes); -int guild_skillup(struct map_session_data *sd, int skill_num); + int account_id,int char_id,const char *mes); +int guild_skillup(struct map_session_data* sd, int skill_num); void guild_block_skill(struct map_session_data *sd, int time); int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd); int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag); int guild_alliance(int guild_id1,int guild_id2,int account_id1,int account_id2); int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id2, - int flag,const char *name1,const char *name2); + int flag,const char *name1,const char *name2); int guild_delalliance(struct map_session_data *sd,int guild_id,int flag); int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd); int guild_check_alliance(int guild_id1, int guild_id2, int flag); |