diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-23 17:20:41 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-23 17:20:41 +0000 |
| commit | 300facbcd059becdc8addac8a2f392452fea5fa0 (patch) | |
| tree | fd9cd0dd6d8eef2e75e6cd120c15b7c7ec9724c2 /src/map/guild.c | |
| parent | de2279c7e5e77a7a939110bbd33c145aeaa09aff (diff) | |
| download | hercules-300facbcd059becdc8addac8a2f392452fea5fa0.tar.gz hercules-300facbcd059becdc8addac8a2f392452fea5fa0.tar.bz2 hercules-300facbcd059becdc8addac8a2f392452fea5fa0.tar.xz hercules-300facbcd059becdc8addac8a2f392452fea5fa0.zip | |
* Added' require_glory_guild'
* Fixed some --addrace variables' sizes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1277 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 06838c4b8..431ef5dec 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -892,15 +892,16 @@ int guild_notice_changed(int guild_id,const char *mes1,const char *mes2) // ギルドエンブレム変更 int guild_change_emblem(struct map_session_data *sd,int len,const char *data) { - struct guild *g = NULL; - + struct guild *g; nullpo_retr(0, sd); - if ((g = guild_search(sd->status.guild_id)) && guild_checkskill(g, GD_GLORYGUILD)>0) - return intif_guild_emblem(sd->status.guild_id,len,data); + if (battle_config.require_glory_guild && + !((g = guild_search(sd->status.guild_id)) && guild_checkskill(g, GD_GLORYGUILD)>0)) { + clif_skill_fail(sd,GD_GLORYGUILD,0,0); + return 0; + } - clif_skill_fail(sd,GD_GLORYGUILD,0,0); - return 0; + return intif_guild_emblem(sd->status.guild_id,len,data); } // ギルドエンブレム変更通知 int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data) |