More numeric to constant conversions..should be most of them... Please report any inventory abnormalities.

common/eq_constants.h

@@ -877,74 +877,6 @@ enum InventoryMainTypes : int16 {
 	_MainCount
 };
 
-enum InventorySlot
-{
-	////////////////////////
-	// Equip slots
-	////////////////////////
-
-	//SLOT_CHARM		= 0,
-	//SLOT_EAR01		= 1,
-	//SLOT_HEAD		= 2,
-	//SLOT_FACE		= 3,
-	//SLOT_EAR02		= 4,
-	//SLOT_NECK		= 5,
-	//SLOT_SHOULDER	= 6,
-	//SLOT_ARMS		= 7,
-	//SLOT_BACK		= 8,
-	//SLOT_BRACER01	= 9,
-	//SLOT_BRACER02	= 10,
-	//SLOT_RANGE		= 11,
-	//SLOT_HANDS		= 12,
-	//SLOT_PRIMARY	= 13,
-	//SLOT_SECONDARY	= 14,
-	//SLOT_RING01		= 15,
-	//SLOT_RING02		= 16,
-	//SLOT_CHEST		= 17,
-	//SLOT_LEGS		= 18,
-	//SLOT_FEET		= 19,
-	//SLOT_WAIST		= 20,
-	//SLOT_AMMO		= 21,
-
-	////////////////////////
-	// All other slots
-	////////////////////////
-	//SLOT_PERSONAL_BEGIN = 22,
-	//SLOT_PERSONAL_END = 29,
-
-	//SLOT_CURSOR		= 30,
-
-	SLOT_CURSOR_END	= (int16)0xFFFE,	// Last item on cursor queue
-	// Cursor bag slots are 331->340 (10 slots)
-
-	// Personal Inventory Slots
-	// Slots 1 through 8 are slots 22->29
-	// Inventory bag slots are 251->330 (10 slots per bag)
-
-	// Tribute slots are 400-404? (upper bound unknown)
-	// storing these in worn item's map
-
-	// Bank slots
-	// Bank slots 1 through 16 are slots 2000->2015
-	// Bank bag slots are 2031->2190
-
-	// Shared bank slots
-	// Shared bank slots 1 through 2 are slots 2500->2501
-	// Shared bank bag slots are 2531->2550
-
-	// Trade session slots
-	// Trade slots 1 through 8 are slots 3000->3007
-	// Trade bag slots are technically 0->79 when passed to client,
-	// but in our code, we treat them as slots 3100->3179
-
-	// Slot used in OP_TradeSkillCombine for world tradeskill containers
-	SLOT_TRADESKILL = 1000,
-	SLOT_AUGMENT = 1001//,
-	//SLOT_POWER_SOURCE = 9999//,
-	// Value recognized by client for destroying an item
-	//SLOT_INVALID = (int16)0xFFFF
-};
-
 #define INVALID_INDEX	-1
 #define NOT_USED		0
 #define NO_ITEM			0
@@ -956,4 +888,84 @@ enum InventorySlot
 #define SUB_BEGIN	0
 #define AUG_BEGIN	0
 
+namespace legacy {
+	// this is for perl and other legacy systems
+
+	typedef enum {
+		SLOT_CHARM			= 0,
+		SLOT_EAR01			= 1,
+		SLOT_HEAD			= 2,
+		SLOT_FACE			= 3,
+		SLOT_EAR02			= 4,
+		SLOT_NECK			= 5,
+		SLOT_SHOULDER		= 6,
+		SLOT_ARMS			= 7,
+		SLOT_BACK			= 8,
+		SLOT_BRACER01		= 9,
+		SLOT_BRACER02		= 10,
+		SLOT_RANGE			= 11,
+		SLOT_HANDS			= 12,
+		SLOT_PRIMARY		= 13,
+		SLOT_SECONDARY		= 14,
+		SLOT_RING01			= 15,
+		SLOT_RING02			= 16,
+		SLOT_CHEST			= 17,
+		SLOT_LEGS			= 18,
+		SLOT_FEET			= 19,
+		SLOT_WAIST			= 20,
+		SLOT_POWER_SOURCE	= 9999,
+		SLOT_AMMO			= 21,
+		SLOT_GENERAL_1		= 22,
+		SLOT_GENERAL_2		= 23,
+		SLOT_GENERAL_3		= 24,
+		SLOT_GENERAL_4		= 25,
+		SLOT_GENERAL_5		= 26,
+		SLOT_GENERAL_6		= 27,
+		SLOT_GENERAL_7		= 28,
+		SLOT_GENERAL_8		= 29,
+		//SLOT_GENERAL_9	= not supported
+		//SLOT_GENERAL_10	= not supported
+		SLOT_CURSOR			= 30,
+		SLOT_CURSOR_END		= (int16)0xFFFE, // I hope no one is using this...
+		SLOT_TRADESKILL		= 1000,
+		SLOT_AUGMENT		= 1001,
+		SLOT_INVALID		= (int16)0xFFFF,
+
+		SLOT_POSSESSIONS_BEGIN	= 0,
+		SLOT_POSSESSIONS_END	= 30,
+
+		SLOT_EQUIPMENT_BEGIN	= 0,
+		SLOT_EQUIPMENT_END		= 21,
+
+		SLOT_PERSONAL_BEGIN		= 22,
+		SLOT_PERSONAL_END		= 29,
+		SLOT_PERSONAL_BAGS_BEGIN	= 251,
+		SLOT_PERSONAL_BAGS_END		= 330,
+
+		SLOT_CURSOR_BAG_BEGIN		= 331,
+		SLOT_CURSOR_BAG_END			= 340,
+
+		SLOT_TRIBUTE_BEGIN	= 400,
+		SLOT_TRIBUTE_END	= 404,
+
+		SLOT_BANK_BEGIN			= 2000,
+		SLOT_BANK_END			= 2023,
+		SLOT_BANK_BAGS_BEGIN	= 2031,
+		SLOT_BANK_BAGS_END		= 2270,
+
+		SLOT_SHARED_BANK_BEGIN		= 2500,
+		SLOT_SHARED_BANK_END		= 2501,
+		SLOT_SHARED_BANK_BAGS_BEGIN	= 2531,
+		SLOT_SHARED_BANK_BAGS_END	= 2550,
+
+		SLOT_TRADE_BEGIN		= 3000,
+		SLOT_TRADE_END			= 3007,
+		SLOT_TRADE_BAGS_BEGIN	= 3031,
+		SLOT_TRADE_BAGS_END		= 3110,
+
+		SLOT_WORLD_BEGIN	= 4000,
+		SLOT_WORLD_END		= 4009
+	} InventorySlot;
+}
+
 #endif