diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-12 09:41:51 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-12 09:41:51 +0000 |
| commit | 1c5fab35e935b870939bcae24ea95e957ed76d5a (patch) | |
| tree | d139ebbdd15d78fbfc4835da6074168c378a0e1c /src/map/guild.c | |
| parent | 76c1280eedaf3327eb15af0290ab7781ff703633 (diff) | |
| download | hercules-1c5fab35e935b870939bcae24ea95e957ed76d5a.tar.gz hercules-1c5fab35e935b870939bcae24ea95e957ed76d5a.tar.bz2 hercules-1c5fab35e935b870939bcae24ea95e957ed76d5a.tar.xz hercules-1c5fab35e935b870939bcae24ea95e957ed76d5a.zip | |
Removed the badly designed/unfinished guild_check_conflict() data integrity check (that wasn't actually being used up 'till now).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11894 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 6193ed69b..889338a9c 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -340,15 +340,6 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd) memcpy(m->name,sd->status.name,NAME_LENGTH); return; } -// ギルド競合確認 -int guild_check_conflict(struct map_session_data *sd) -{ - nullpo_retr(0, sd); - - intif_guild_checkconflict(sd->status.guild_id, - sd->status.account_id,sd->status.char_id); - return 0; -} // ギルドのEXPキャッシュをinter鯖にフラッシュする int guild_payexp_timer_sub(DBKey dataid, void *data, va_list ap) @@ -770,10 +761,9 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag) if( sd2!=NULL ) clif_guild_inviteack(sd2,2); - // いちおう競合確認 - guild_check_conflict(sd); //Next line commented because it do nothing, look at guild_recv_info [LuzZza] //clif_charnameupdate(sd); //Update display name [Skotlex] + return 0; } |