diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-05 11:06:48 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-05 11:06:48 +0000 |
| commit | ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a (patch) | |
| tree | b3a459940f3ccb52de4b0e11189756f49ae603e2 /src/map/guild.c | |
| parent | 887a23e815dc20731a423c726b22d0d0a3974d93 (diff) | |
| download | hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.tar.gz hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.tar.bz2 hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.tar.xz hercules-ecbe6aa5b86c57909ee1a7369ceda6b9348fdb1a.zip | |
* Added allow_atcommand_when_mute
* Temporarily leaving the changing guild emblems requiring Glory of Guild feature only for TXT until the SQL char-server supports guild skills fully
* Modified battle_range again to check if src's type is a player first
* Modified skill_nocast_db
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@459 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 0943b4b6d..32aa2434c 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -874,11 +874,17 @@ int guild_change_emblem(struct map_session_data *sd,int len,const char *data) 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); - - clif_skill_fail(sd,GD_GLORYGUILD,0,0); - return 0; + /* 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 + return 0; } // ギルドエンブレム変更通知 int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data) |