[Decaldev-cvscommit] source/DecalFilters DecalFilters.idl,1.31,1.32 World.cpp,1.45,1.46 World.h,1.31,1.32

[<ci...@us...>]

Update of /cvsroot/decaldev/source/DecalFilters
In directory sc8-pr-cvs1:/tmp/cvs-serv20499/DecalFilters

Modified Files:
	DecalFilters.idl World.cpp World.h 
Log Message:
allows for query of number of known object types -- will allow plugins to be more dynamic if needed.

Index: DecalFilters.idl
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.idl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** DecalFilters.idl	10 Apr 2003 04:05:31 -0000	1.31
--- DecalFilters.idl	11 Apr 2003 03:24:42 -0000	1.32
***************
*** 95,99 ****
  enum eObjectType
  {
! 	eMeleeWeapon,
  	eArmor,
  	eClothing,
--- 95,99 ----
  enum eObjectType
  {
! 	eMeleeWeapon = 0,
  	eArmor,
  	eClothing,
***************
*** 136,140 ****
  	eFoci,
  	eSalvage,
! 	eUst
  };
  
--- 136,143 ----
  	eFoci,
  	eSalvage,
! 	eUst,
! 
! 	// Leave this last!!!
! 	eNumObjectTypes
  };
  
***************
*** 400,403 ****
--- 403,407 ----
  		[propget, id(9), helpstring("property ByOwner")] HRESULT ByOwner(long GUID, [out, retval] IWorldIterator * *pVal);
  		[propget, id(10), helpstring("property Landscape")] HRESULT Landscape([out, retval] IWorldIterator * *pVal);
+ 		[propget, id(11), helpstring("property NumObjectTypes")] HRESULT NumObjectTypes([out, retval] long *lVal);
  	};
  	[

Index: World.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** World.cpp	10 Apr 2003 04:05:31 -0000	1.45
--- World.cpp	11 Apr 2003 03:24:42 -0000	1.46
***************
*** 1306,1309 ****
--- 1306,1317 ----
  
  
+ STDMETHODIMP cWorld::get_NumObjectTypes(long *lVal)
+ {
+ 	*lVal = (long) eNumObjectTypes;
+ 
+ 	return S_OK;
+ }
+ 
+ 
  // changes the slot of every item the specified container, of the specified type
  //	that is after the specified slot position, in the specified direction

Index: World.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** World.h	8 Oct 2002 19:34:59 -0000	1.31
--- World.h	11 Apr 2003 03:24:42 -0000	1.32
***************
*** 265,268 ****
--- 265,269 ----
  	STDMETHOD(get_Object)(long GUID, /*[out, retval]*/ IWorldObject **pVal);
  	STDMETHOD(Distance2D)(long GUID1, long GUID2, /*[out, retval]*/ float* pVal);
+ 	STDMETHOD(get_NumObjectTypes)(/*[out, retval]*/ long *lVal);
  
  	// INetworkFilterImpl