diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-15 05:30:25 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-15 05:30:25 +0000 |
| commit | a7c1a55bb6f3c3236ba02722e948a52c645a4918 (patch) | |
| tree | 15c41cc68bb37051f7fb94bac03055875e25fe5d /src/map/clif.h | |
| parent | ec4acd7b1d7f180af5929239ef0706d98d4b6bfc (diff) | |
| download | hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.gz hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.bz2 hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.xz hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.zip | |
* Merged changes from trunk [14784:14819/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14821 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.h')
| -rw-r--r-- | src/map/clif.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 2d90eb522..70a7fdce8 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -29,7 +29,7 @@ struct party_booking_ad_info; #include <stdarg.h> // packet DB #define MAX_PACKET_DB 0x900 -#define MAX_PACKET_VER 25 +#define MAX_PACKET_VER 26 struct s_packet_db { short len; @@ -430,7 +430,7 @@ int clif_guild_memberlogin_notice(struct guild *g,int idx,int flag); int clif_guild_invite(struct map_session_data *sd,struct guild *g); int clif_guild_inviteack(struct map_session_data *sd,int flag); int clif_guild_leave(struct map_session_data *sd,const char *name,const char *mes); -int clif_guild_expulsion(struct map_session_data *sd,const char *name,const char *mes,int account_id); +void clif_guild_expulsion(struct map_session_data* sd, const char* name, const char* mes, int account_id); int clif_guild_positionchanged(struct guild *g,int idx); int clif_guild_memberpositionchanged(struct guild *g,int idx); int clif_guild_emblem(struct map_session_data *sd,struct guild *g); |