Added support for new carts (requires packetver 20120201 or newer). Super-Ultra-Plus thanks to Fatal Error and Judas.

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

1 files changed, 15 insertions, 7 deletions

diff --git a/src/map/status.h b/src/map/status.h
index 192ffd6d9..50eecec0d 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -598,6 +598,8 @@ typedef enum sc_type {
 	SC_WATER_INSIGNIA,
 	SC_WIND_INSIGNIA, //515
 	SC_EARTH_INSIGNIA,
+	/* new pushcart */
+	SC_PUSH_CART,
 	
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 } sc_type;
@@ -1368,14 +1370,9 @@ enum {
 	OPTION_SIGHT     = 0x00000001,
 	OPTION_HIDE      = 0x00000002,
 	OPTION_CLOAK     = 0x00000004,
-	OPTION_CART1     = 0x00000008,
 	OPTION_FALCON    = 0x00000010,
 	OPTION_RIDING    = 0x00000020,
 	OPTION_INVISIBLE = 0x00000040,
-	OPTION_CART2     = 0x00000080,
-	OPTION_CART3     = 0x00000100,
-	OPTION_CART4     = 0x00000200,
-	OPTION_CART5     = 0x00000400,
 	OPTION_ORCISH    = 0x00000800,
 	OPTION_WEDDING   = 0x00001000,
 	OPTION_RUWACH    = 0x00002000,
@@ -1392,9 +1389,20 @@ enum {
 	OPTION_DRAGON3   = 0x01000000,
 	OPTION_DRAGON4   = 0x02000000,
 	OPTION_DRAGON5   = 0x04000000,
-	OPTION_MOUNTING  = 0x08000000,//dull name (cuz ind named it :/)
-	// compound constants
+	OPTION_MOUNTING  = 0x08000000,
+	
+#ifndef NEW_CARTS
+	OPTION_CART1     = 0x00000008,
+	OPTION_CART2     = 0x00000080,
+	OPTION_CART3     = 0x00000100,
+	OPTION_CART4     = 0x00000200,
+	OPTION_CART5     = 0x00000400,
+	
+	/*  compound constant for older carts */
 	OPTION_CART      = OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5,
+#endif
+	
+	// compound constants
 	OPTION_DRAGON    = OPTION_DRAGON1|OPTION_DRAGON2|OPTION_DRAGON3|OPTION_DRAGON4|OPTION_DRAGON5,
 	OPTION_MASK      = ~OPTION_INVISIBLE,
 };