- Updated clif_disp_onlyself to not use dynamic memory and write directly to the player's buffer.

- Updated @noask to also tell the rejected what he has just rejected (added msg_athena entries for each of the different requests)
- Since noask already does a player lookup, updated the corresponding parsing functions to take the player rather than the player id (prevents double lookups)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7117 54d463be-8e91-2dee-dedb-b68131a5f0ec

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;