[Sphere-axis-commits] CVS: Axis Axis.txt,1.28,1.29 CNPC.CPP,1.9,1.10 itemgentab.cpp,1.12,1.13 SPAWNTAB.CPP,1.12,1.13

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

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

Modified Files:
	Axis.txt CNPC.CPP itemgentab.cpp SPAWNTAB.CPP 
Log Message:
DEFS are listed instead of IDs (if defined) in the Item and Spawn tabs.

Index: Axis.txt
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Axis.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** Axis.txt	25 May 2002 02:46:29 -0000	1.28
--- Axis.txt	28 May 2002 16:33:17 -0000	1.29
***************
*** 25,28 ****
--- 25,29 ----
  =============================================================================
  Changes in version 0.13.2 (in development)
+ · DEFS are listed instead of IDs (if defined) in the Item and Spawn tabs.
  · The Account Manager window is now modeless, minimizable, and resizeable.
  · Axissvr should handle paths in the ALLOWEDPATHS directive better.  Specify the complete relative paths (e.g. scripts:scripts\test:etc)

Index: CNPC.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/CNPC.CPP,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** CNPC.CPP	14 May 2002 20:03:34 -0000	1.9
--- CNPC.CPP	28 May 2002 16:33:17 -0000	1.10
***************
*** 246,249 ****
--- 246,250 ----
  			*/
  		}
+ 		m_csDefName = csValue;
  		break;
  	case 1:

Index: itemgentab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/itemgentab.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** itemgentab.cpp	16 May 2002 01:31:57 -0000	1.12
--- itemgentab.cpp	28 May 2002 16:33:17 -0000	1.13
***************
*** 140,144 ****
  	LoadScripts();
  	this->m_clcItems.InsertColumn(0, "Item Description", LVCFMT_LEFT, 140, -1);
! 	this->m_clcItems.InsertColumn(1, "ID", LVCFMT_LEFT, 75, -1);
  
  	WORD wFlags = 0;
--- 140,144 ----
  	LoadScripts();
  	this->m_clcItems.InsertColumn(0, "Item Description", LVCFMT_LEFT, 140, -1);
! 	this->m_clcItems.InsertColumn(1, "ID", LVCFMT_LEFT, 140, -1);
  
  	WORD wFlags = 0;
***************
*** 356,361 ****
  			{
  				CSObject * pObject = (CSObject *) pSubsection->m_ItemList.GetNext(pos);
  				this->m_clcItems.InsertItem(iCount, pObject->m_csDescription, 0);
! 				this->m_clcItems.SetItemText(iCount, 1, pObject->m_csValue);
  				this->m_clcItems.SetItemData(iCount, (DWORD)pObject);
  				iCount++;
--- 356,367 ----
  			{
  				CSObject * pObject = (CSObject *) pSubsection->m_ItemList.GetNext(pos);
+ 				CItem item;
+ 				item.CopyBase(pObject);
+ 				item.Load();
  				this->m_clcItems.InsertItem(iCount, pObject->m_csDescription, 0);
! 				if ( item.m_csDef != "" )
! 					this->m_clcItems.SetItemText(iCount, 1, item.m_csDef);
! 				else
! 					this->m_clcItems.SetItemText(iCount, 1, pObject->m_csValue);
  				this->m_clcItems.SetItemData(iCount, (DWORD)pObject);
  				iCount++;

Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** SPAWNTAB.CPP	16 May 2002 01:31:57 -0000	1.12
--- SPAWNTAB.CPP	28 May 2002 16:33:17 -0000	1.13
***************
*** 121,125 ****
  	LoadScripts();
  	this->m_clcCreatures.InsertColumn(0, "NPC Type", LVCFMT_LEFT, 120, -1);
! 	this->m_clcCreatures.InsertColumn(1, "ID", LVCFMT_LEFT, 60, -1);
  
  	CString csValue;
--- 121,125 ----
  	LoadScripts();
  	this->m_clcCreatures.InsertColumn(0, "NPC Type", LVCFMT_LEFT, 120, -1);
! 	this->m_clcCreatures.InsertColumn(1, "ID", LVCFMT_LEFT, 120, -1);
  
  	CString csValue;
***************
*** 284,289 ****
  			{
  				CSObject * pObject = (CSObject *) pSubsection->m_ItemList.GetNext(pos);
  				this->m_clcCreatures.InsertItem(iCount, pObject->m_csDescription, 0);
! 				this->m_clcCreatures.SetItemText(iCount, 1, pObject->m_csValue);
  				this->m_clcCreatures.SetItemData(iCount, (DWORD)pObject);
  				iCount++;
--- 284,301 ----
  			{
  				CSObject * pObject = (CSObject *) pSubsection->m_ItemList.GetNext(pos);
+ 				CString csDef;
+ 				if ( pObject->m_bType == TYPE_CHAR )
+ 				{
+ 					CNPC npc;
+ 					npc.CopyBase(pObject);
+ 					npc.Load();
+ 					csDef = npc.m_csDefName;
+ 				}
+ 
  				this->m_clcCreatures.InsertItem(iCount, pObject->m_csDescription, 0);
! 				if ( csDef != "" )
! 					this->m_clcCreatures.SetItemText(iCount, 1, csDef);
! 				else
! 					this->m_clcCreatures.SetItemText(iCount, 1, pObject->m_csValue);
  				this->m_clcCreatures.SetItemData(iCount, (DWORD)pObject);
  				iCount++;