diff options
author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-13 08:13:28 +0000 |
---|---|---|
committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-13 08:13:28 +0000 |
commit | c4e6857d4774b25dcd9b9137f76c14c92015d691 (patch) | |
tree | 9f773e7c5aa5f11861be27c7bf4c6bb0edb3ab27 /src/map/guild.c | |
parent | cc36297906a9cbb6a7a8c7120b1b9973090e6ba8 (diff) | |
download | hercules-c4e6857d4774b25dcd9b9137f76c14c92015d691.tar.gz hercules-c4e6857d4774b25dcd9b9137f76c14c92015d691.tar.bz2 hercules-c4e6857d4774b25dcd9b9137f76c14c92015d691.tar.xz hercules-c4e6857d4774b25dcd9b9137f76c14c92015d691.zip |
* Added and testing support for 2004-12-06Sakexe
* Removed emblem changing requiring Glory of Guild limited to TXT only
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@967 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
-rw-r--r-- | src/map/guild.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index ddaa05999..5f9e31794 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -890,16 +890,10 @@ int guild_change_emblem(struct map_session_data *sd,int len,const char *data) nullpo_retr(0, sd); - /* Temporarily only for TXT until there's proper char server support [Celest] */ - #ifdef TXT_ONLY - if ((g = guild_search(sd->status.guild_id)) && guild_checkskill(g, GD_GLORYGUILD)>0) - return intif_guild_emblem(sd->status.guild_id,len,data); - - clif_skill_fail(sd,GD_GLORYGUILD,0,0); - #else - if ((g = guild_search(sd->status.guild_id))) - return intif_guild_emblem(sd->status.guild_id,len,data); - #endif + if ((g = guild_search(sd->status.guild_id)) && guild_checkskill(g, GD_GLORYGUILD)>0) + return intif_guild_emblem(sd->status.guild_id,len,data); + + clif_skill_fail(sd,GD_GLORYGUILD,0,0); return 0; } // ギルドエンブレム変更通知 |