- Coded @reset.

- Reenabled @changesex
- Added function pet_create_egg which handles creating pet eggs correctly (when passed item id is indeed a valid petegg). Applied this on @createitem and getitem.
- Cleaned up code of @item
- Added define UNKNOWN_ITEM_ID (512 = apple)
- Added IT_* enumation item_Types to identify said data from items.
- Cleaned up the itemdb_isequip functions. itemdb_isequip will now return if the item is equipable by players, itemdb_isstackable returns if the item can be stacked, and itemdb_isidentified returns if the item should drop identified.
- Added defines CARD0_PET/CARD0_FORGE/CARD0_CREATED to identify if a given item has "invalid" cards, added define function itemdb_isspecial to simplify this check.
- Removed itemdb.c considering item ids above 20000 as invalid.
- Cleaned up script commands getitem and card-counting related ones. 
- Cleaned up a bit more pc_isequip


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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/trade.c b/src/map/trade.c
index 04d4c83e5..6cf7fe293 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -223,7 +223,7 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd) {
 			

 			data = itemdb_search(inventory[n].nameid);

 			i = MAX_INVENTORY;

-			if (!itemdb_isequip2(data)) { //Stackable item.

+			if (itemdb_isstackable2(data)) { //Stackable item.

 				for(i = 0; i < MAX_INVENTORY; i++)

 					if (inventory2[i].nameid == inventory[n].nameid &&

 						inventory2[i].card[0] == inventory[n].card[0] && inventory2[i].card[1] == inventory[n].card[1] &&

@@ -259,7 +259,7 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd) {
 		// search if it's possible to add item (for full inventory)

 		data = itemdb_search(inventory2[n].nameid);

 		i = MAX_INVENTORY;

-		if (!itemdb_isequip2(data)) {

+		if (itemdb_isstackable2(data)) {

 			for(i = 0; i < MAX_INVENTORY; i++)

 				if (inventory[i].nameid == inventory2[n].nameid &&

 					inventory[i].card[0] == inventory2[n].card[0] && inventory[i].card[1] == inventory2[n].card[1] &&