[Sphere-axis-commits] CVS: UOArt UOArtCtl.cpp,1.14,1.15 UOArtCtl.h,1.10,1.11

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

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

Modified Files:
	UOArtCtl.cpp UOArtCtl.h 
Log Message:
Support for map2 and statics2

Index: UOArtCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** UOArtCtl.cpp	15 May 2002 20:37:12 -0000	1.14
--- UOArtCtl.cpp	28 May 2002 19:13:29 -0000	1.15
***************
*** 598,602 ****
  			break;
  		case ART_MAPPREVIEW:
! 			if ( m_dwArtIndex >= 0x60000 )
  				return;
  			break;
--- 598,602 ----
  			break;
  		case ART_MAPPREVIEW:
! 			if ( m_dwArtIndex >= 0x6E100 )
  				return;
  			break;
***************
*** 604,607 ****
--- 604,616 ----
  		if ( m_sArtType == ART_MAPPREVIEW )
  		{
+ 			// Which map are we on?
+ 			m_wDrawFlags = m_wDrawFlags & 0x00FF;	// Mask out the map flags
+ 			if ( dwIndex > 0x60000 )
+ 			{
+ 				m_wDrawFlags |= F_MAP2;
+ 				dwIndex -= 0x60000;
+ 			}
+ 			else
+ 				m_wDrawFlags |= F_MAP0;
  			// Draw the surrounding blocks as well.
  			// Determine the x and y values of the block.
***************
*** 816,823 ****
  		break;
  	case ART_MAPPREVIEW:
! 		csDataFile = m_saMulPaths.GetAt(VERFILE_STATICS0);
! 		csIndexFile = m_saMulPaths.GetAt(VERFILE_STAIDX0);
! 		csMapFile = m_saMulPaths.GetAt(VERFILE_MAP0);
! 		dwVerdataSection = VERFILE_STATICS0;
  		LoadArtData();
  		if ( (m_wDrawFlags & F_SHOWTERRAIN) )
--- 825,842 ----
  		break;
  	case ART_MAPPREVIEW:
! 		if ( m_wDrawFlags & F_MAP0 )
! 		{
! 			csDataFile = m_saMulPaths.GetAt(VERFILE_STATICS0);
! 			csIndexFile = m_saMulPaths.GetAt(VERFILE_STAIDX0);
! 			csMapFile = m_saMulPaths.GetAt(VERFILE_MAP0);
! 			dwVerdataSection = VERFILE_STATICS0;
! 		}
! 		else
! 		{
! 			csDataFile = m_saMulPaths.GetAt(VERFILE_STATICS2);
! 			csIndexFile = m_saMulPaths.GetAt(VERFILE_STAIDX2);
! 			csMapFile = m_saMulPaths.GetAt(VERFILE_MAP2);
! 			dwVerdataSection = VERFILE_STATICS2;
! 		}
  		LoadArtData();
  		if ( (m_wDrawFlags & F_SHOWTERRAIN) )

Index: UOArtCtl.h
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArtCtl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** UOArtCtl.h	12 May 2002 16:19:57 -0000	1.10
--- UOArtCtl.h	28 May 2002 19:13:29 -0000	1.11
***************
*** 230,233 ****
--- 230,235 ----
  #define F_SHOWSTATICS 0x0020
  #define F_SHOWDYNAMICS 0x0040
+ #define F_MAP0	0x0100
+ #define F_MAP2	0x0200
  	void ReadRegistry();
  	void DrawArt(short sArtType, CRect bounds, DWORD dwArtIndex, short dx, short dy, short dz, WORD wColor = 0, WORD wFlags = 0);