From 581475bc6416790765c498aa3d611f6868ffb64a Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 14 Nov 2004 16:18:26 +0000
Subject: Fixed some file types

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/trade.c | 572 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 286 insertions(+), 286 deletions(-)

(limited to 'src/map/trade.c')

diff --git a/src/map/trade.c b/src/map/trade.c
index 41a89cd7a..babcdc6e0 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -1,286 +1,286 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "clif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "trade.h"
-#include "pc.h"
-#include "npc.h"
-#include "battle.h"
-#include "nullpo.h"
-#include "log.h"
-
-/*==========================================
- * 取引要請を相手に送る
- *------------------------------------------
- */
-void trade_traderequest(struct map_session_data *sd,int target_id)
-{
-	struct map_session_data *target_sd;
-
-	nullpo_retv(sd);
-
-	if((target_sd = map_id2sd(target_id)) != NULL){
-		if(!battle_config.invite_request_check) {
-			if(target_sd->guild_invite>0 || target_sd->party_invite>0){
-				clif_tradestart(sd,2);	// 相手はPT要請中かGuild要請中
-				return;
-			}
-		}
-		if((target_sd->trade_partner !=0) || (sd->trade_partner !=0)) {
-			trade_tradecancel(sd); //person is in another trade
-		}
-		else{
-			if((pc_isGM(sd) < 60) && (sd->bl.m != target_sd->bl.m
-			 || (sd->bl.x - target_sd->bl.x <= -5 || sd->bl.x - target_sd->bl.x >= 5)
-			 || (sd->bl.y - target_sd->bl.y <= -5 || sd->bl.y - target_sd->bl.y >= 5))) {
-				clif_tradestart(sd,0); //too far
-			}
-			else if(sd!=target_sd) {
-				target_sd->trade_partner = sd->status.account_id;
-				sd->trade_partner = target_sd->status.account_id;
-				clif_traderequest(target_sd,sd->status.name);
-			}
-		}
-	}
-	else{
-		clif_tradestart(sd,1); //character does not exist
-	}
-}
-
-/*==========================================
- * 取引要請
- *------------------------------------------
- */
-void trade_tradeack(struct map_session_data *sd,int type)
-{
-	struct map_session_data *target_sd;
-
-	nullpo_retv(sd);
-
-	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
-		clif_tradestart(target_sd,type);
-		clif_tradestart(sd,type);
-		if(type == 4){ // Cancel
-			sd->deal_locked =0;
-			sd->trade_partner=0;
-			target_sd->deal_locked=0;
-			target_sd->trade_partner=0;
-		}
-		if(sd->npc_id != 0)
-			npc_event_dequeue(sd);
-		if(target_sd->npc_id != 0)
-			npc_event_dequeue(target_sd);
-	}
-}
-
-/*==========================================
- * アイテム追加
- *------------------------------------------
- */
-void trade_tradeadditem(struct map_session_data *sd,int index,int amount)
-{
-	struct map_session_data *target_sd;
-	int trade_i;
-	int trade_weight=0;
-	int c;
-
-	nullpo_retv(sd);
-
-	if(((target_sd = map_id2sd(sd->trade_partner)) != NULL) && (sd->deal_locked < 1)){
-		if(index<2 || index>=MAX_INVENTORY+2){
-			if(index == 0 && amount > 0 && amount <= sd->status.zeny){
-				sd->deal_zeny=amount;
-				clif_tradeadditem(sd,target_sd,0,amount);
-			}
-		}else if(amount <= sd->status.inventory[index-2].amount && amount > 0){
-			for(trade_i=0; trade_i<10;trade_i++){
-				if(sd->deal_item_amount[trade_i] == 0){
-					trade_weight+=sd->inventory_data[index-2]->weight*amount;
-					if(target_sd->weight + trade_weight > target_sd->max_weight){
-						clif_tradeitemok(sd,index,1); //fail to add item -- the player was over weighted.
-                                                amount = 0; // [MouseJstr]
-					}else{
-						for(c=0; c==trade_i-1;c++){ // re-deal exploit protection [Valaris]
-							if(sd->deal_item_index[c]==index) {
-								trade_tradecancel(sd);
-								return;
-							}
-						}
-						sd->deal_item_index[trade_i] =index;
-						sd->deal_item_amount[trade_i]+=amount;
-						clif_tradeitemok(sd,index,0); //success to add item
-						clif_tradeadditem(sd,target_sd,index,amount);
-					}
-					break;
-				}else{
-					trade_weight+=sd->inventory_data[sd->deal_item_index[trade_i]-2]->weight*sd->deal_item_amount[trade_i];
-				}
-			}
-		}
-	}
-}
-
-/*==========================================
- * アイテム追加完了(ok押し)
- *------------------------------------------
- */
-void trade_tradeok(struct map_session_data *sd)
-{
-	struct map_session_data *target_sd;
-	int trade_i;
-
-	nullpo_retv(sd);
-	
-	for(trade_i=0;trade_i<10;trade_i++) {
-		if(sd->deal_item_amount[trade_i]>sd->status.inventory[sd->deal_item_index[trade_i]-2].amount ||
-			sd->deal_item_amount[trade_i]<0) {
-			trade_tradecancel(sd);
-			return;
-		}
-	
-	}
-	
-	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
-		sd->deal_locked=1;
-		clif_tradeitemok(sd,0,0);
-		clif_tradedeal_lock(sd,0);
-		clif_tradedeal_lock(target_sd,1);
-	}
-}
-
-/*==========================================
- * 取引キャンセル
- *------------------------------------------
- */
-void trade_tradecancel(struct map_session_data *sd)
-{
-	struct map_session_data *target_sd;
-	int trade_i;
-
-	nullpo_retv(sd);
-
-	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
-		for(trade_i=0; trade_i<10;trade_i++) { //give items back (only virtual)
-			if(sd->deal_item_amount[trade_i] != 0) {
-				clif_additem(sd,sd->deal_item_index[trade_i]-2,sd->deal_item_amount[trade_i],0);
-				sd->deal_item_index[trade_i] =0;
-				sd->deal_item_amount[trade_i]=0;
-			}
-			if(target_sd->deal_item_amount[trade_i] != 0) {
-				clif_additem(target_sd,target_sd->deal_item_index[trade_i]-2,target_sd->deal_item_amount[trade_i],0);
-				target_sd->deal_item_index[trade_i] =0;
-				target_sd->deal_item_amount[trade_i]=0;
-			}
-		}
-		if(sd->deal_zeny) {
-			clif_updatestatus(sd,SP_ZENY);
-			sd->deal_zeny=0;
-		}
-		if(target_sd->deal_zeny) {
-			clif_updatestatus(target_sd,SP_ZENY);
-			target_sd->deal_zeny=0;
-		}
-		sd->deal_locked =0;
-		sd->trade_partner=0;
-		target_sd->deal_locked=0;
-		target_sd->trade_partner=0;
-		clif_tradecancelled(sd);
-		clif_tradecancelled(target_sd);
-	}
-}
-
-/*==========================================
- * 取引許諾(trade押し)
- *------------------------------------------
- */
-void trade_tradecommit(struct map_session_data *sd)
-{
-	struct map_session_data *target_sd;
-	int trade_i;
-
-	nullpo_retv(sd);
-
-	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
-		if( (sd->deal_locked >=1) && (target_sd->deal_locked >=1) ){ // both have pressed 'ok'
-			if(sd->deal_locked < 2) {sd->deal_locked=2;} // set locked to 2
-			if(target_sd->deal_locked==2) { // the other one pressed 'trade' too
-				for(trade_i=0; trade_i<10;trade_i++) {
-					if(sd->deal_item_amount[trade_i] != 0) {
-						int n=sd->deal_item_index[trade_i]-2;
-						int flag;
-
-						//Dupe Fix by mark
-						if (sd->status.inventory[n].amount < sd->deal_item_amount[trade_i])
-							sd->deal_item_amount[trade_i] = sd->status.inventory[n].amount;
-						//End Dupe Fix
-
-						#ifndef TXT_ONLY
-						if(log_config.trade > 0)
-							log_trade(sd,target_sd,n,sd->deal_item_amount[trade_i]);
-						#endif //USE_SQL
-
-						flag = pc_additem(target_sd,&sd->status.inventory[n],sd->deal_item_amount[trade_i]);
-						if(flag==0)
-						pc_delitem(sd,n,sd->deal_item_amount[trade_i],1);
-						else
-							clif_additem(sd,n,sd->deal_item_amount[trade_i],0);
-						sd->deal_item_index[trade_i] =0;
-						sd->deal_item_amount[trade_i]=0;
-					}
-					if(target_sd->deal_item_amount[trade_i] != 0) {
-						int n=target_sd->deal_item_index[trade_i]-2;
-						int flag;
-
-						//Dupe Fix by mark
-						if (target_sd->status.inventory[n].amount < target_sd->deal_item_amount[trade_i])
-							target_sd->deal_item_amount[trade_i] = target_sd->status.inventory[n].amount;
-						//End Dupe Fix
-
-						#ifndef TXT_ONLY
-						if(log_config.trade > 0)
-							log_trade(target_sd,sd,n,target_sd->deal_item_amount[trade_i]);
-						#endif //USE_SQL
-
-						flag = pc_additem(sd,&target_sd->status.inventory[n],target_sd->deal_item_amount[trade_i]);
-						if(flag==0)
-						pc_delitem(target_sd,n,target_sd->deal_item_amount[trade_i],1);
-						else
-							clif_additem(target_sd,n,target_sd->deal_item_amount[trade_i],0);
-						target_sd->deal_item_index[trade_i] =0;
-						target_sd->deal_item_amount[trade_i]=0;
-					}
-				}
-				if(sd->deal_zeny) {
-					#ifndef TXT_ONLY	
-					if (log_config.trade > 0 && log_config.zeny > 0)
-						log_zeny(sd, target_sd, sd->deal_zeny);
-					#endif //USE_SQL
-					sd->status.zeny -= sd->deal_zeny;
-					clif_updatestatus(sd,SP_ZENY);
-					target_sd->status.zeny += sd->deal_zeny;
-					clif_updatestatus(target_sd,SP_ZENY);
-					sd->deal_zeny=0;
-				}
-				if(target_sd->deal_zeny) {
-					#ifndef TXT_ONLY
-					if (log_config.trade > 0 && log_config.zeny > 0)
-						log_zeny(target_sd, sd, target_sd->deal_zeny);
-					#endif //USE_SQL
-					target_sd->status.zeny -= target_sd->deal_zeny;
-					clif_updatestatus(target_sd,SP_ZENY);
-					sd->status.zeny += target_sd->deal_zeny;
-					clif_updatestatus(sd,SP_ZENY);
-					target_sd->deal_zeny=0;
-				}
-				sd->deal_locked =0;
-				sd->trade_partner=0;
-				target_sd->deal_locked=0;
-				target_sd->trade_partner=0;
-				clif_tradecompleted(sd,0);
-				clif_tradecompleted(target_sd,0);
-			}
-		}
-	}
-}
+#include <stdio.h>
+#include <string.h>
+
+#include "clif.h"
+#include "itemdb.h"
+#include "map.h"
+#include "trade.h"
+#include "pc.h"
+#include "npc.h"
+#include "battle.h"
+#include "nullpo.h"
+#include "log.h"
+
+/*==========================================
+ * 取引要請を相手に送る
+ *------------------------------------------
+ */
+void trade_traderequest(struct map_session_data *sd,int target_id)
+{
+	struct map_session_data *target_sd;
+
+	nullpo_retv(sd);
+
+	if((target_sd = map_id2sd(target_id)) != NULL){
+		if(!battle_config.invite_request_check) {
+			if(target_sd->guild_invite>0 || target_sd->party_invite>0){
+				clif_tradestart(sd,2);	// 相手はPT要請中かGuild要請中
+				return;
+			}
+		}
+		if((target_sd->trade_partner !=0) || (sd->trade_partner !=0)) {
+			trade_tradecancel(sd); //person is in another trade
+		}
+		else{
+			if((pc_isGM(sd) < 60) && (sd->bl.m != target_sd->bl.m
+			 || (sd->bl.x - target_sd->bl.x <= -5 || sd->bl.x - target_sd->bl.x >= 5)
+			 || (sd->bl.y - target_sd->bl.y <= -5 || sd->bl.y - target_sd->bl.y >= 5))) {
+				clif_tradestart(sd,0); //too far
+			}
+			else if(sd!=target_sd) {
+				target_sd->trade_partner = sd->status.account_id;
+				sd->trade_partner = target_sd->status.account_id;
+				clif_traderequest(target_sd,sd->status.name);
+			}
+		}
+	}
+	else{
+		clif_tradestart(sd,1); //character does not exist
+	}
+}
+
+/*==========================================
+ * 取引要請
+ *------------------------------------------
+ */
+void trade_tradeack(struct map_session_data *sd,int type)
+{
+	struct map_session_data *target_sd;
+
+	nullpo_retv(sd);
+
+	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
+		clif_tradestart(target_sd,type);
+		clif_tradestart(sd,type);
+		if(type == 4){ // Cancel
+			sd->deal_locked =0;
+			sd->trade_partner=0;
+			target_sd->deal_locked=0;
+			target_sd->trade_partner=0;
+		}
+		if(sd->npc_id != 0)
+			npc_event_dequeue(sd);
+		if(target_sd->npc_id != 0)
+			npc_event_dequeue(target_sd);
+	}
+}
+
+/*==========================================
+ * アイテム追加
+ *------------------------------------------
+ */
+void trade_tradeadditem(struct map_session_data *sd,int index,int amount)
+{
+	struct map_session_data *target_sd;
+	int trade_i;
+	int trade_weight=0;
+	int c;
+
+	nullpo_retv(sd);
+
+	if(((target_sd = map_id2sd(sd->trade_partner)) != NULL) && (sd->deal_locked < 1)){
+		if(index<2 || index>=MAX_INVENTORY+2){
+			if(index == 0 && amount > 0 && amount <= sd->status.zeny){
+				sd->deal_zeny=amount;
+				clif_tradeadditem(sd,target_sd,0,amount);
+			}
+		}else if(amount <= sd->status.inventory[index-2].amount && amount > 0){
+			for(trade_i=0; trade_i<10;trade_i++){
+				if(sd->deal_item_amount[trade_i] == 0){
+					trade_weight+=sd->inventory_data[index-2]->weight*amount;
+					if(target_sd->weight + trade_weight > target_sd->max_weight){
+						clif_tradeitemok(sd,index,1); //fail to add item -- the player was over weighted.
+                                                amount = 0; // [MouseJstr]
+					}else{
+						for(c=0; c==trade_i-1;c++){ // re-deal exploit protection [Valaris]
+							if(sd->deal_item_index[c]==index) {
+								trade_tradecancel(sd);
+								return;
+							}
+						}
+						sd->deal_item_index[trade_i] =index;
+						sd->deal_item_amount[trade_i]+=amount;
+						clif_tradeitemok(sd,index,0); //success to add item
+						clif_tradeadditem(sd,target_sd,index,amount);
+					}
+					break;
+				}else{
+					trade_weight+=sd->inventory_data[sd->deal_item_index[trade_i]-2]->weight*sd->deal_item_amount[trade_i];
+				}
+			}
+		}
+	}
+}
+
+/*==========================================
+ * アイテム追加完了(ok押し)
+ *------------------------------------------
+ */
+void trade_tradeok(struct map_session_data *sd)
+{
+	struct map_session_data *target_sd;
+	int trade_i;
+
+	nullpo_retv(sd);
+	
+	for(trade_i=0;trade_i<10;trade_i++) {
+		if(sd->deal_item_amount[trade_i]>sd->status.inventory[sd->deal_item_index[trade_i]-2].amount ||
+			sd->deal_item_amount[trade_i]<0) {
+			trade_tradecancel(sd);
+			return;
+		}
+	
+	}
+	
+	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
+		sd->deal_locked=1;
+		clif_tradeitemok(sd,0,0);
+		clif_tradedeal_lock(sd,0);
+		clif_tradedeal_lock(target_sd,1);
+	}
+}
+
+/*==========================================
+ * 取引キャンセル
+ *------------------------------------------
+ */
+void trade_tradecancel(struct map_session_data *sd)
+{
+	struct map_session_data *target_sd;
+	int trade_i;
+
+	nullpo_retv(sd);
+
+	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
+		for(trade_i=0; trade_i<10;trade_i++) { //give items back (only virtual)
+			if(sd->deal_item_amount[trade_i] != 0) {
+				clif_additem(sd,sd->deal_item_index[trade_i]-2,sd->deal_item_amount[trade_i],0);
+				sd->deal_item_index[trade_i] =0;
+				sd->deal_item_amount[trade_i]=0;
+			}
+			if(target_sd->deal_item_amount[trade_i] != 0) {
+				clif_additem(target_sd,target_sd->deal_item_index[trade_i]-2,target_sd->deal_item_amount[trade_i],0);
+				target_sd->deal_item_index[trade_i] =0;
+				target_sd->deal_item_amount[trade_i]=0;
+			}
+		}
+		if(sd->deal_zeny) {
+			clif_updatestatus(sd,SP_ZENY);
+			sd->deal_zeny=0;
+		}
+		if(target_sd->deal_zeny) {
+			clif_updatestatus(target_sd,SP_ZENY);
+			target_sd->deal_zeny=0;
+		}
+		sd->deal_locked =0;
+		sd->trade_partner=0;
+		target_sd->deal_locked=0;
+		target_sd->trade_partner=0;
+		clif_tradecancelled(sd);
+		clif_tradecancelled(target_sd);
+	}
+}
+
+/*==========================================
+ * 取引許諾(trade押し)
+ *------------------------------------------
+ */
+void trade_tradecommit(struct map_session_data *sd)
+{
+	struct map_session_data *target_sd;
+	int trade_i;
+
+	nullpo_retv(sd);
+
+	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
+		if( (sd->deal_locked >=1) && (target_sd->deal_locked >=1) ){ // both have pressed 'ok'
+			if(sd->deal_locked < 2) {sd->deal_locked=2;} // set locked to 2
+			if(target_sd->deal_locked==2) { // the other one pressed 'trade' too
+				for(trade_i=0; trade_i<10;trade_i++) {
+					if(sd->deal_item_amount[trade_i] != 0) {
+						int n=sd->deal_item_index[trade_i]-2;
+						int flag;
+
+						//Dupe Fix by mark
+						if (sd->status.inventory[n].amount < sd->deal_item_amount[trade_i])
+							sd->deal_item_amount[trade_i] = sd->status.inventory[n].amount;
+						//End Dupe Fix
+
+						#ifndef TXT_ONLY
+						if(log_config.trade > 0)
+							log_trade(sd,target_sd,n,sd->deal_item_amount[trade_i]);
+						#endif //USE_SQL
+
+						flag = pc_additem(target_sd,&sd->status.inventory[n],sd->deal_item_amount[trade_i]);
+						if(flag==0)
+						pc_delitem(sd,n,sd->deal_item_amount[trade_i],1);
+						else
+							clif_additem(sd,n,sd->deal_item_amount[trade_i],0);
+						sd->deal_item_index[trade_i] =0;
+						sd->deal_item_amount[trade_i]=0;
+					}
+					if(target_sd->deal_item_amount[trade_i] != 0) {
+						int n=target_sd->deal_item_index[trade_i]-2;
+						int flag;
+
+						//Dupe Fix by mark
+						if (target_sd->status.inventory[n].amount < target_sd->deal_item_amount[trade_i])
+							target_sd->deal_item_amount[trade_i] = target_sd->status.inventory[n].amount;
+						//End Dupe Fix
+
+						#ifndef TXT_ONLY
+						if(log_config.trade > 0)
+							log_trade(target_sd,sd,n,target_sd->deal_item_amount[trade_i]);
+						#endif //USE_SQL
+
+						flag = pc_additem(sd,&target_sd->status.inventory[n],target_sd->deal_item_amount[trade_i]);
+						if(flag==0)
+						pc_delitem(target_sd,n,target_sd->deal_item_amount[trade_i],1);
+						else
+							clif_additem(target_sd,n,target_sd->deal_item_amount[trade_i],0);
+						target_sd->deal_item_index[trade_i] =0;
+						target_sd->deal_item_amount[trade_i]=0;
+					}
+				}
+				if(sd->deal_zeny) {
+					#ifndef TXT_ONLY	
+					if (log_config.trade > 0 && log_config.zeny > 0)
+						log_zeny(sd, target_sd, sd->deal_zeny);
+					#endif //USE_SQL
+					sd->status.zeny -= sd->deal_zeny;
+					clif_updatestatus(sd,SP_ZENY);
+					target_sd->status.zeny += sd->deal_zeny;
+					clif_updatestatus(target_sd,SP_ZENY);
+					sd->deal_zeny=0;
+				}
+				if(target_sd->deal_zeny) {
+					#ifndef TXT_ONLY
+					if (log_config.trade > 0 && log_config.zeny > 0)
+						log_zeny(target_sd, sd, target_sd->deal_zeny);
+					#endif //USE_SQL
+					target_sd->status.zeny -= target_sd->deal_zeny;
+					clif_updatestatus(target_sd,SP_ZENY);
+					sd->status.zeny += target_sd->deal_zeny;
+					clif_updatestatus(sd,SP_ZENY);
+					target_sd->deal_zeny=0;
+				}
+				sd->deal_locked =0;
+				sd->trade_partner=0;
+				target_sd->deal_locked=0;
+				target_sd->trade_partner=0;
+				clif_tradecompleted(sd,0);
+				clif_tradecompleted(target_sd,0);
+			}
+		}
+	}
+}
-- 
cgit v1.2.3-70-g09d2