[Decaldev-cvscommit] source/Include Decal.idl,1.31,1.32

[<ha...@us...>]

Update of /cvsroot/decaldev/source/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv17653

Modified Files:
	Decal.idl 
Log Message:
Fix huge merge error

Index: Decal.idl
===================================================================
RCS file: /cvsroot/decaldev/source/Include/Decal.idl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Decal.idl	7 Mar 2003 19:17:53 -0000	1.31
--- Decal.idl	7 Mar 2003 23:37:40 -0000	1.32
***************
*** 8,12 ****
  import "ocidl.idl";
  
! enum eAttribute
  {
  	eCurrentHealth			= 1,
--- 8,21 ----
  import "ocidl.idl";
  
! /* I'm not 100% sure about this */
! enum eTrainLevel
! {
! 	eUntrained				= 1,
! 	eTrained				= 2,
! 	eSpecialized			= 3,
! 	eTrainLevel_DWORD		= 0x7FFFFFFF
! };
! 
! enum eVital
  {
  	eCurrentHealth			= 1,
***************
*** 19,22 ****
--- 28,36 ----
  	eBaseStamina			= 8,
  	eBaseMana				= 9,
+ 	eVital_DWORD			= 0x7FFFFFFF
+ };
+ 
+ enum eAttribute
+ {
  	eCurrentStrength		= 1,
  	eCurrentEndurance		= 2,
***************
*** 30,34 ****
  	eBaseCoordination		= 10,
  	eBaseFocus				= 11,
! 	eBaseSelf				= 12
  };
  
--- 44,49 ----
  	eBaseCoordination		= 10,
  	eBaseFocus				= 11,
! 	eBaseSelf				= 12,
! 	eAttribute_DWORD		= 0x7FFFFFFF
  };
  
***************
*** 104,144 ****
  	eBaseFletchingSkill			= 87,
  	eBaseAlchemySkill			= 88,
! 	eBaseCookingSkill			= 89
  };
  
  enum eAvailableHooks
  {
! 	ePrevSelect			= 0x00000001,
! 	eCurrentSelect		= 0x00000002,
! 	eMouse				= 0x00000004,
! 	eCastSpell			= 0x00000008,
! 	eMoveItem			= 0x00000010,
! 	eSelectItem			= 0x00000020,
! 	eUseItem			= 0x00000040,
! 	eCombatState		= 0x00000080,
! 	eChatState			= 0x00000100,
! 	eGetFellowStats 	= 0x00000200,
! 	eStackCount			= 0x00000400,
! 	eTestFormula		= 0x00000800,
! 	eVendorID			= 0x00001000,
! 	eBusyState			= 0x00002000,
! 	eBusyStateID		= 0x00004000,
! 	ePointerState		= 0x00008000,
! 	eMoveItemEx			= 0x00010000,
! 	ePosition			= 0x00020000,
! 	eFaceHeading		= 0x00040000,
! 	eArea3DWidth		= 0x00080000,
! 	eArea3DHeight		= 0x00100000,
! 	eObjectDestroyed	= 0x00200000,
! 	eSendTell			= 0x00400000,
! 	eSetAutorun			= 0x00800000,
! 	eGetVital			= 0x01000000,
! 	eSendTellEx			= 0x02000000,
! 	eLocalChatText		= 0x04000000,
! 	eLocalChatEmote		= 0x08000000,
! 	eSetCombatState		= 0x10000000,
! 	eGetAttribute		= 0x20000000,
! 	eGetSkill			= 0x40000000,
! 	eHooksAvailEx  		= 0x80000000
  };
  
--- 119,160 ----
  	eBaseFletchingSkill			= 87,
  	eBaseAlchemySkill			= 88,
! 	eBaseCookingSkill			= 89,
! 	eSkill_DWORD				= 0x7FFFFFFF
  };
  
  enum eAvailableHooks
  {
! 	ePrevSelect				= 0x00000001,
! 	eCurrentSelect			= 0x00000002,
! 	eMouse					= 0x00000004,
! 	eCastSpell				= 0x00000008,
! 	eMoveItem				= 0x00000010,
! 	eSelectItem				= 0x00000020,
! 	eUseItem				= 0x00000040,
! 	eCombatState			= 0x00000080,
! 	eChatState				= 0x00000100,
! 	eGetFellowStats			= 0x00000200,
! 	eStackCount				= 0x00000400,
! 	eTestFormula			= 0x00000800,
! 	eVendorID				= 0x00001000,
! 	eBusyState				= 0x00002000,
! 	eBusyStateID			= 0x00004000,
! 	ePointerState			= 0x00008000,
! 	eMoveItemEx				= 0x00010000,
! 	ePosition				= 0x00020000,
! 	eFaceHeading			= 0x00040000,
! 	eArea3DWidth			= 0x00080000,
! 	eArea3DHeight			= 0x00100000,
! 	eObjectDestroyed		= 0x00200000,
! 	eSendTell				= 0x00400000,
! 	eSetAutorun				= 0x00800000,
! 	eGetVital				= 0x01000000,
! 	eSendTellEx				= 0x02000000,
! 	eLocalChatText			= 0x04000000,
! 	eLocalChatEmote			= 0x08000000,
! 	eSetCombatState			= 0x10000000,
! 	eGetAttribute			= 0x20000000,
! 	eGetSkill				= 0x40000000,
! 	eHooksAvailEx  			= 0x80000000
  };
  
***************
*** 147,155 ****
  { 
  	eLogout					= 0,
! 	eObjectFromGUID			= 1,
! 	eObjectFromGUIDClass	= 2,
! 	eOnSelectItemEvent		= 3,
! 	eAvailableHooksEx_DWORD		= 0x7FFFFFFF // coerce enums into 4 byte instead of two
  };
  	
  
--- 163,177 ----
  { 
  	eLogout					= 0,
! 	eSecureTrade_Add		= 1,
! 	eColorEx				= 2,
! 	eSkillInfo				= 3,
! 	eAttributeInfo			= 4,
! 	eVitalInfo				= 5,
! 	eObjectFromGUID			= 6,
! 	eObjectFromGUIDClass	= 7,
! 	eOnSelectItemEvent		= 8,
! 	eAvailableHooksEx_DWORD	= 0x7FFFFFFF // coerce enums into 4 byte instead of two
  };
+ 
  	
  
***************
*** 246,249 ****
--- 268,284 ----
  		[id(43), helpstring("method Logout")] HRESULT Logout();
  		[id(44), helpstring("method SetDecal")] HRESULT SetDecal([in] IUnknown *pDecal);
+ 		[id(45), helpstring("method SecureTrade_Add")] HRESULT SecureTrade_Add([in] long ItemID, [out, retval] VARIANT_BOOL *pVal);
+ 
+ 		[propget, id(46), helpstring("property SkillTrainLevel")] HRESULT SkillTrainLevel([in] enum eSkill SkillID, [out, retval] enum eTrainLevel *pVal);
+ 		[propget, id(47), helpstring("property SkillTotalXP")] HRESULT SkillTotalXP([in] enum eSkill SkillID, [out, retval] int *pVal);
+ 		[propget, id(48), helpstring("property SkillFreePoints")] HRESULT SkillFreePoints([in] enum eSkill SkillID, [out, retval] int *pVal);
+ 		[propget, id(49), helpstring("property SkillClicks")] HRESULT SkillClicks([in] enum eSkill SkillID, [out, retval] int *pVal);
+ 
+ 		[propget, id(50), helpstring("property AttributeTotalXP")] HRESULT AttributeTotalXP([in] enum eAttribute AttributeID, [out, retval] int *pVal);
+ 		[propget, id(51), helpstring("property AttributeClicks")] HRESULT AttributeClicks([in] enum eAttribute AttributeID, [out, retval] int *pVal);
+ 		[propget, id(52), helpstring("property AttributeStart")] HRESULT AttributeStart([in] enum eAttribute AttributeID, [out, retval] int *pVal);
+ 
+ 		[propget, id(53), helpstring("property VitalTotalXP")] HRESULT VitalTotalXP([in] enum eVital VitalD, [out, retval] int *pVal);
+ 		[propget, id(54), helpstring("property VitalClicks")] HRESULT VitalClicks([in] enum eVital VitalID, [out, retval] int *pVal);
  	};