- Pet catching now uses the menuskill variables to prevent item usage from disrupting the catch process.

- Added Safetywall to the list not blocked by Dispell.
- Added some include limits.h required by window compiles.
- Corrected Wedding rings being trade-able. 


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

1 files changed, 4 insertions, 4 deletions

diff --git a/db/item_trade.txt b/db/item_trade.txt
index 099fc1f8b..3d0a4802c 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -4,7 +4,7 @@
 //Trading mask values:

 //1:Item can't be drop

 //2:Item can't be traded (nor vended)

-//4:Item can only be traded with wedded partner

+//4:Wedded partner can override restriction 2.

 //8:Item can't be sold to npcs

 //16:Item can't be placed in the cart

 //32:Item can't be placed in the storage

@@ -12,8 +12,8 @@
 //Example:

 //1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),

 //only GMs of GM-level 50 and up can override the setting.

-2634,109,100

-2635,109,100

+2634,111,100

+2635,111,100

 2644,99,100

 //Novice Red Potion

 569,8,100

@@ -25,4 +25,4 @@
 //7475,123,100

 //7476,123,100

 //Leather Pouch (part of Cooking Quest)

-7432,123,100
\ No newline at end of file
+7432,123,100