[Sphere-axis-commits] CVS: UOArt UOArtCtl.cpp,1.10,1.11 UOArtCtl.h,1.8,1.9 UOArt.opt,1.9,1.10

[Philip E. <pes...@us...>]

Update of /cvsroot/sphere-axis/UOArt
In directory usw-pr-cvs1:/tmp/cvs-serv16048

Modified Files:
	UOArtCtl.cpp UOArtCtl.h UOArt.opt 
Log Message:
Fixed problem with cached items not being read from custom mul files.

Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** UOArtCtl.cpp	11 May 2002 05:47:58 -0000	1.10
--- UOArtCtl.cpp	11 May 2002 18:35:45 -0000	1.11
***************
*** 59,63 ****
  }
  
! CItemCache::CItemCache(WORD wIndex, CString csClientPath, CVerdataIdx * pVerdata)
  {
  	m_wIndex = wIndex;
--- 59,63 ----
  }
  
! CItemCache::CItemCache(WORD wIndex, CString csVerdata, CString csIdxFile, CString csMulFile, CVerdataIdx * pVerdata)
  {
  	m_wIndex = wIndex;
***************
*** 68,73 ****
  		// Load this from the verdata.mul file
  		CFile fVerdata;
- 		CString csVerdata;
- 		csVerdata.Format("%sverdata.mul", csClientPath);
  		if ( fVerdata.Open(csVerdata, CFile::typeBinary | CFile::modeRead |CFile::shareDenyNone) )
  		{
--- 68,71 ----
***************
*** 81,88 ****
  	{
  		CFile fIdx, fMul;
- 		CString csIdxFile, csMulFile;
- 
- 		csIdxFile.Format("%sartidx.mul", csClientPath);
- 		csMulFile.Format("%sart.mul", csClientPath);
  
  		if ( fIdx.Open(csIdxFile, CFile::typeBinary | CFile::modeRead | CFile::shareDenyNone) )
--- 79,82 ----
***************
*** 2131,2137 ****
  	DWORD dwVerdataIdx = FindVerdata(VERFILE_ART, (DWORD) wIndex);
  	if ( dwVerdataIdx != 0xFFFFFFFF )
! 		pNewCache = new CItemCache(wIndex, m_csUOPath, &m_pVerdataIdx[dwVerdataIdx]);
  	else
! 		pNewCache = new CItemCache(wIndex, m_csUOPath, NULL);
  
  	// Move the oldest item out of cache, if we are over our limit
--- 2125,2131 ----
  	DWORD dwVerdataIdx = FindVerdata(VERFILE_ART, (DWORD) wIndex);
  	if ( dwVerdataIdx != 0xFFFFFFFF )
! 		pNewCache = new CItemCache(wIndex, m_saMulPaths.GetAt(VERFILE_VERDATA), m_saMulPaths.GetAt(VERFILE_ARTIDX), m_saMulPaths.GetAt(VERFILE_ART), &m_pVerdataIdx[dwVerdataIdx]);
  	else
! 		pNewCache = new CItemCache(wIndex, m_saMulPaths.GetAt(VERFILE_VERDATA), m_saMulPaths.GetAt(VERFILE_ARTIDX), m_saMulPaths.GetAt(VERFILE_ART), NULL);
  
  	// Move the oldest item out of cache, if we are over our limit

Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** UOArtCtl.h	11 May 2002 05:47:58 -0000	1.8
--- UOArtCtl.h	11 May 2002 18:35:45 -0000	1.9
***************
*** 162,166 ****
  public:
  	CItemCache();
! 	CItemCache(WORD wIndex, CString csClientPath, CVerdataIdx * pVerdata = NULL);
  	~CItemCache();
  	BYTE * GetBuffer() { return &m_pBuffer[0]; }
--- 162,166 ----
  public:
  	CItemCache();
! 	CItemCache(WORD wIndex, CString csVerdataFile, CString csIdxFile, CString csMulFile, CVerdataIdx * pVerdata = NULL);
  	~CItemCache();
  	BYTE * GetBuffer() { return &m_pBuffer[0]; }

Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
Binary files /tmp/cvsx64T3U and /tmp/cvsORRd1H differ