- Cleaned up unitattack, unittalk and unitdeadsit

- Updated status_get_name to take into account fakename, also cleaned it up.
- Cleaned up the char-server code when the last point of a player is not found. First it'll check if there's any mapserver online, and then, if there is, it'll look for the major cities. If this fails, then the player will be told server is closed instead of trying to send him to a "random map".


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

1 files changed, 0 insertions, 9 deletions

diff --git a/src/map/trade.c b/src/map/trade.c
index 4d8f4200d..442566e49 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -230,9 +230,6 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd) {
 							return 0;

 						inventory2[i].amount += amount;

 						inventory[n].amount -= amount;

-						//let's not make room, as pc_additem is done before pc_delitem, so it could lead to problems depending on order.

-//							if (!inventory[n].amount) 

-//								malloc_set(&inventory[n], 0, sizeof(struct item));

 						break;

 					}

 			}

@@ -244,8 +241,6 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd) {
 				memcpy(&inventory2[i], &inventory[n], sizeof(struct item));

 				inventory2[i].amount = amount;

 				inventory[n].amount -= amount;

-//					if (!inventory[n].amount)

-//						malloc_set(&inventory[n], 0, sizeof(struct item));

 			}

 		}

 		amount = tsd->deal.item[trade_i].amount;

@@ -266,8 +261,6 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd) {
 						return 0;

 					inventory[i].amount += amount;

 					inventory2[n].amount -= amount;

-//					if (!inventory2[n].amount)

-//						malloc_set(&inventory2[n], 0, sizeof(struct item));

 					break;

 				}

 		}

@@ -278,8 +271,6 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd) {
 			memcpy(&inventory[i], &inventory2[n], sizeof(struct item));

 			inventory[i].amount = amount;

 			inventory2[n].amount -= amount;

-//			if (!inventory2[n].amount)

-//				malloc_set(&inventory2[n], 0, sizeof(struct item));

 		}

 	}