- 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, 2 insertions, 3 deletions

diff --git a/src/map/trade.c b/src/map/trade.c
index 3597eed71..236be38c2 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -23,8 +23,7 @@
  * Initiates a trade request.

  *------------------------------------------

  */

-void trade_traderequest(struct map_session_data *sd, int target_id) {

-	struct map_session_data *target_sd;

+void trade_traderequest(struct map_session_data *sd, struct map_session_data *target_sd) {

 	int level;

 

 	nullpo_retv(sd);

@@ -34,7 +33,7 @@ void trade_traderequest(struct map_session_data *sd, int target_id) {
 		return; //Can't trade in notrade mapflag maps.

 	}

 

-	if ((target_sd = map_id2sd(target_id)) == NULL || sd == target_sd) {

+	if (target_sd  == NULL || sd == target_sd) {

 		clif_tradestart(sd, 1); // character does not exist

 		return;

 	}