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

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

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

Modified Files:
	UOArtCtl.cpp UOArtCtl.h UOArt.opt 
Log Message:
Fixed crash bug and made unicode compatability fixes.

Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** UOArtCtl.cpp	11 May 2002 18:35:45 -0000	1.11
--- UOArtCtl.cpp	12 May 2002 16:19:57 -0000	1.12
***************
*** 2170,2174 ****
  void CUOArtCtrl::SetMulPath(LPCTSTR pszNewPath) 
  {
! 	m_csUOPath = _T(pszNewPath);
  	if ( m_csUOPath.GetAt(m_csUOPath.GetLength() - 1) != '\\')
  		m_csUOPath += _T("\\");
--- 2170,2174 ----
  void CUOArtCtrl::SetMulPath(LPCTSTR pszNewPath) 
  {
! 	m_csUOPath = pszNewPath;
  	if ( m_csUOPath.GetAt(m_csUOPath.GetLength() - 1) != '\\')
  		m_csUOPath += _T("\\");
***************
*** 2178,2270 ****
  void CUOArtCtrl::InitializeMulPaths()
  {
! 	m_saMulPaths.SetSize(37);
  
  	CString csPath;
  
! 	csPath.Format("%smap0.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MAP0, csPath);
  
! 	csPath.Format("%sstaidx0.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STAIDX0, csPath);
  
! 	csPath.Format("%sstatics0.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STATICS0, csPath);
  
! 	csPath.Format("%sartidx.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ARTIDX, csPath);
  
! 	csPath.Format("%sart.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ART, csPath);
  
! 	csPath.Format("%sanim.idx", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIMIDX, csPath);
  
! 	csPath.Format("%sanim.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIM, csPath);
  
! 	csPath.Format("%ssoundidx.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SOUNDIDX, csPath);
  
! 	csPath.Format("%ssound.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SOUND, csPath);
  
! 	csPath.Format("%stexidx.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_TEXIDX, csPath);
  
! 	csPath.Format("%stexmaps.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_TEXMAPS, csPath);
  
! 	csPath.Format("%sgumpidx.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_GUMPIDX, csPath);
  
! 	csPath.Format("%sgumpart.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_GUMPART, csPath);
  
! 	csPath.Format("%smulti.idx", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MULTIIDX, csPath);
  
! 	csPath.Format("%smulti.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MULTI, csPath);
  
! 	csPath.Format("%sskills.idx", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SKILLSIDX, csPath);
  
! 	csPath.Format("%sskills.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SKILLS, csPath);
  
! 	csPath.Format("%slightidx.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_LIGHTIDX, csPath);
  
! 	csPath.Format("%slight.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_LIGHT, csPath);
  
! 	csPath.Format("%stiledata.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_TILEDATA, csPath);
  
! 	csPath.Format("%sanimdata.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIMDATA, csPath);
  
! 	csPath.Format("%shues.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_HUES, csPath);
  
! 	csPath.Format("%saniminfo.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIMINFO, csPath);
  
! 	csPath.Format("%sfonts.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_FONTS, csPath);
  
! 	csPath.Format("%sradarcol.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_RADARCOL, csPath);
  
! 	csPath.Format("%sverdata.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_VERDATA, csPath);
  
! 	csPath.Format("%smap2.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MAP2, csPath);
  
! 	csPath.Format("%sstaidx2.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STAIDX2, csPath);
  
! 	csPath.Format("%sstatics2.mul", m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STATICS2, csPath);
  }
--- 2178,2270 ----
  void CUOArtCtrl::InitializeMulPaths()
  {
! 	m_saMulPaths.SetSize(VERFILE_ENDOFTABLE);
  
  	CString csPath;
  
! 	csPath.Format(_T("%smap0.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MAP0, csPath);
  
! 	csPath.Format(_T("%sstaidx0.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STAIDX0, csPath);
  
! 	csPath.Format(_T("%sstatics0.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STATICS0, csPath);
  
! 	csPath.Format(_T("%sartidx.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ARTIDX, csPath);
  
! 	csPath.Format(_T("%sart.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ART, csPath);
  
! 	csPath.Format(_T("%sanim.idx"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIMIDX, csPath);
  
! 	csPath.Format(_T("%sanim.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIM, csPath);
  
! 	csPath.Format(_T("%ssoundidx.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SOUNDIDX, csPath);
  
! 	csPath.Format(_T("%ssound.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SOUND, csPath);
  
! 	csPath.Format(_T("%stexidx.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_TEXIDX, csPath);
  
! 	csPath.Format(_T("%stexmaps.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_TEXMAPS, csPath);
  
! 	csPath.Format(_T("%sgumpidx.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_GUMPIDX, csPath);
  
! 	csPath.Format(_T("%sgumpart.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_GUMPART, csPath);
  
! 	csPath.Format(_T("%smulti.idx"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MULTIIDX, csPath);
  
! 	csPath.Format(_T("%smulti.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MULTI, csPath);
  
! 	csPath.Format(_T("%sskills.idx"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SKILLSIDX, csPath);
  
! 	csPath.Format(_T("%sskills.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_SKILLS, csPath);
  
! 	csPath.Format(_T("%slightidx.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_LIGHTIDX, csPath);
  
! 	csPath.Format(_T("%slight.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_LIGHT, csPath);
  
! 	csPath.Format(_T("%stiledata.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_TILEDATA, csPath);
  
! 	csPath.Format(_T("%sanimdata.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIMDATA, csPath);
  
! 	csPath.Format(_T("%shues.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_HUES, csPath);
  
! 	csPath.Format(_T("%saniminfo.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_ANIMINFO, csPath);
  
! 	csPath.Format(_T("%sfonts.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_FONTS, csPath);
  
! 	csPath.Format(_T("%sradarcol.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_RADARCOL, csPath);
  
! 	csPath.Format(_T("%sverdata.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_VERDATA, csPath);
  
! 	csPath.Format(_T("%smap2.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_MAP2, csPath);
  
! 	csPath.Format(_T("%sstaidx2.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STAIDX2, csPath);
  
! 	csPath.Format(_T("%sstatics2.mul"), m_csUOPath);
  	m_saMulPaths.SetAt(VERFILE_STATICS2, csPath);
  }

Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** UOArtCtl.h	11 May 2002 18:35:45 -0000	1.9
--- UOArtCtl.h	12 May 2002 16:19:57 -0000	1.10
***************
*** 156,160 ****
  #define VERFILE_STAIDX2 0x26
  #define VERFILE_STATICS2 0x27
! 
  
  class CItemCache
--- 156,160 ----
  #define VERFILE_STAIDX2 0x26
  #define VERFILE_STATICS2 0x27
! #define VERFILE_ENDOFTABLE 0x28
  
  class CItemCache

Index: UOArt.opt
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.opt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
Binary files /tmp/cvsZiQ9JM and /tmp/cvsiBZt2o differ