diff options
| author | Haru <haru@dotalux.com> | 2016-01-29 11:45:57 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-01-29 11:45:57 +0100 |
| commit | 1500f9a168d61f36e8b1167e964e73a4e764f974 (patch) | |
| tree | 0cd3c03ec5decc0ae6e73dc775ae0cd31903d913 /src | |
| parent | 006e9b2d3e7d5ad3d89fae731d08aedcf73d2dbb (diff) | |
| parent | 89bc83eb10741057574c9843350711d52b31685a (diff) | |
| download | hercules-1500f9a168d61f36e8b1167e964e73a4e764f974.tar.gz hercules-1500f9a168d61f36e8b1167e964e73a4e764f974.tar.bz2 hercules-1500f9a168d61f36e8b1167e964e73a4e764f974.tar.xz hercules-1500f9a168d61f36e8b1167e964e73a4e764f974.zip | |
Merge pull request #1100 from theultramage/gperm
more meaningful names for fields of enum guild_permission
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/int_guild.c | 2 | ||||
| -rw-r--r-- | src/common/mmo.h | 3 | ||||
| -rw-r--r-- | src/map/guild.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 03a1d368d..60efeac94 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -1201,7 +1201,7 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member g->member[0].modified = GS_MEMBER_MODIFIED; // Set default positions - g->position[0].mode = GPERM_BOTH; + g->position[0].mode = GPERM_ALL; strcpy(g->position[0].name,"GuildMaster"); strcpy(g->position[MAX_GUILDPOSITION-1].name,"Newbie"); g->position[0].modified = g->position[MAX_GUILDPOSITION-1].modified = GS_POSITION_MODIFIED; diff --git a/src/common/mmo.h b/src/common/mmo.h index 37fc63e29..6f573a571 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -749,7 +749,8 @@ enum { //Change Member Infos enum guild_permission { // Guild permissions GPERM_INVITE = 0x01, GPERM_EXPEL = 0x10, - GPERM_BOTH = GPERM_INVITE|GPERM_EXPEL, + GPERM_ALL = GPERM_INVITE|GPERM_EXPEL, + GPERM_MASK = GPERM_ALL, }; enum { diff --git a/src/map/guild.c b/src/map/guild.c index cba05638f..f4f0c0528 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1117,7 +1117,7 @@ int guild_change_position(int guild_id,int idx,int mode,int exp_mode,const char nullpo_ret(name); exp_mode = cap_value(exp_mode, 0, battle_config.guild_exp_limit); - p.mode=mode&GPERM_BOTH; // Invite and Expel + p.mode=mode&GPERM_MASK; p.exp_mode=exp_mode; safestrncpy(p.name,name,NAME_LENGTH); return intif->guild_position(guild_id,idx,&p); |