[Sphere-axis-commits] CVS: Axis SPAWNTAB.CPP,1.10,1.11

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

Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv14620

Modified Files:
	SPAWNTAB.CPP 
Log Message:
Fixed a possible issue when selecting spawn groups from the spawn tab.

Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** SPAWNTAB.CPP	8 May 2002 15:44:18 -0000	1.10
--- SPAWNTAB.CPP	10 May 2002 00:06:21 -0000	1.11
***************
*** 384,409 ****
  	if ( pObject->m_csFilename == "" )
  		return;
! 	CString csSection;
! 	CNPC npc;
! 	npc.CopyBase(pObject);
! 	npc.Load();
! 	WORD wID;
! 	if ( isdigit(npc.m_csValue.GetAt(0) ) )
  	{
! 		if ( ahextoi(npc.m_csValue) < 0x0400 && ahextoi(npc.m_csValue) != 0 )
! 			wID = (WORD) ahextoi(npc.m_csValue);
  		else
! 			wID = npc.m_wID;
  	}
! 	else
  	{
! 		if ( DefLookup(npc.m_csValue) < 0x0400 && DefLookup(npc.m_csValue) != 0 )
! 			wID = (WORD) DefLookup(npc.m_csValue);
! 		else
! 			wID = npc.m_wID;
  	}
- 	WORD wColor = (WORD) DefLookup(npc.m_csColor);
- 	m_Display.SetArtColor(wColor);
- 	m_Display.SetArtIndex(wID);
  
  	*pResult = 0;
--- 384,417 ----
  	if ( pObject->m_csFilename == "" )
  		return;
! 	// Is this an NPC or a spawn group?
! 	if ( pObject->m_bType == TYPE_CHAR )
  	{
! 		CNPC npc;
! 		npc.CopyBase(pObject);
! 		npc.Load();
! 		WORD wID;
! 		if ( isdigit(npc.m_csValue.GetAt(0) ) )
! 		{
! 			if ( ahextoi(npc.m_csValue) < 0x0400 && ahextoi(npc.m_csValue) != 0 )
! 				wID = (WORD) ahextoi(npc.m_csValue);
! 			else
! 				wID = npc.m_wID;
! 		}
  		else
! 		{
! 			if ( DefLookup(npc.m_csValue) < 0x0400 && DefLookup(npc.m_csValue) != 0 )
! 				wID = (WORD) DefLookup(npc.m_csValue);
! 			else
! 				wID = npc.m_wID;
! 		}
! 		WORD wColor = (WORD) DefLookup(npc.m_csColor);
! 		m_Display.SetArtColor(wColor);
! 		m_Display.SetArtIndex(wID);
  	}
! 	else if ( pObject->m_bType == TYPE_SPAWN )
  	{
! 		// What should we display for a spawn group?
! 		// Nothing for now
  	}
  
  	*pResult = 0;