summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 78ef6188d..2515cc4a3 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -630,15 +630,13 @@ int guild_recv_info(struct guild *sg)
// ギルドへの勧誘
-int guild_invite(struct map_session_data *sd,int account_id)
+int guild_invite(struct map_session_data *sd,struct map_session_data *tsd)
{
- struct map_session_data *tsd;
struct guild *g;
int i;
nullpo_retr(0, sd);
- tsd= map_id2sd(account_id);
g=guild_search(sd->status.guild_id);
if(tsd==NULL || g==NULL)
@@ -1266,9 +1264,8 @@ int guild_check_alliance(int guild_id1, int guild_id2, int flag)
return 0;
}
// ギルド同盟要求
-int guild_reqalliance(struct map_session_data *sd,int account_id)
+int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
{
- struct map_session_data *tsd= map_id2sd(account_id);
struct guild *g[2];
int i;
@@ -1386,9 +1383,8 @@ int guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
return 0;
}
// ギルド敵対
-int guild_opposition(struct map_session_data *sd,int char_id)
+int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd)
{
- struct map_session_data *tsd=map_id2sd(char_id);
struct guild *g;
int i;