[Sphere-axis-commits] CVS: Axis/S_Sphere52 Def.cpp,1.5,1.6 ScriptsMain.cpp,1.32,1.33

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

Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv24238

Modified Files:
	Def.cpp ScriptsMain.cpp 
Log Message:
no message

Index: Def.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Def.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Def.cpp	24 Jul 2003 20:12:44 -0000	1.5
--- Def.cpp	4 Sep 2003 02:32:28 -0000	1.6
***************
*** 112,115 ****
--- 112,117 ----
  	if ( IsHexValue(pszExp) )
  		return ahextoi(pszExp);
+ 	if ( IsDecimalValue(pszExp) )
+ 		return atoi(pszExp);
  	int iDef = Main->m_pScripts->m_aDefs.Find(pszExp);
  	if ( iDef != -1 )

Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** ScriptsMain.cpp	8 Aug 2003 15:49:43 -0000	1.32
--- ScriptsMain.cpp	4 Sep 2003 02:32:28 -0000	1.33
***************
*** 3067,3071 ****
  	// Format the spawn info here
  	CString sInfo;
! 	sInfo.Format(_T("%s,%s,%ld,%ld,%ld"), pSpawn->m_dwItemType == ITEM_SPAWN_CHAR ? _T("NPC") : _T("ITEM"), pSpawn->m_csBaseID, pSpawn->m_pX, pSpawn->m_pY, pSpawn->m_pZ);
  	return sInfo;
  }
--- 3067,3071 ----
  	// Format the spawn info here
  	CString sInfo;
! 	sInfo.Format(_T("%s,0%04x,%ld,%ld,%ld"), pSpawn->m_dwItemType == ITEM_SPAWN_CHAR ? _T("NPC") : _T("ITEM"), pSpawn->m_dwMore1, pSpawn->m_pX, pSpawn->m_pY, pSpawn->m_pZ);
  	return sInfo;
  }
***************
*** 3237,3241 ****
  		m_pDlg->SetRange32(0, (ULONG) fWorld.GetLength());
  		m_pDlg->SetPos(0);
! 		CString sMessage = locale->String(IDS_TRAVEL_LOADINGSPAWNS);
  		m_pDlg->m_csMessage.SetWindowText(sMessage);
  		BOOL bStatus = TRUE;
--- 3237,3242 ----
  		m_pDlg->SetRange32(0, (ULONG) fWorld.GetLength());
  		m_pDlg->SetPos(0);
! 		CString sMessage;
! 		sMessage.Format(locale->String(IDS_READINGFILE), m_sWorldItemFile);
  		m_pDlg->m_csMessage.SetWindowText(sMessage);
  		BOOL bStatus = TRUE;
***************
*** 3249,3253 ****
  			if ( ! bStatus )
  				break;
! 			if ( iLine % 10000 == 0 )
  				m_pDlg->SetPos(offset);
  			if ( sLine.Find(_T("[WORLDITEM")) == 0 )
--- 3250,3254 ----
  			if ( ! bStatus )
  				break;
! 			if ( iLine++ % 10000 == 0 )
  				m_pDlg->SetPos(offset);
  			if ( sLine.Find(_T("[WORLDITEM")) == 0 )