spherescript-commits

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

Update of /cvsroot/spherescript/SphereScript
In directory usw-pr-cvs1:/tmp/cvs-serv4869

Modified Files:
	common.cpp CScriptObjects.cpp 
Log Message:
Fixes for the custom location problem in Axis.

Index: common.cpp
===================================================================
RCS file: /cvsroot/spherescript/SphereScript/common.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common.cpp	2001/06/05 20:31:08	1.1
--- common.cpp	2001/06/13 03:35:20	1.2
***************
*** 2820,2824 ****
  {
  	// Most likely, the old file name doesn't have the path associated with it.
! 	if (csOldFile.Find(":") == -1 && csOldFile.Find("ini") == -1 )
  	{
  		CString csPath = GetScriptPath();
--- 2820,2824 ----
  {
  	// Most likely, the old file name doesn't have the path associated with it.
! 	if (csOldFile.Find(":") == -1 && csOldFile.Find("ini") == -1 && csOldFile.Find("custloc.scp") == -1)
  	{
  		CString csPath = GetScriptPath();

Index: CScriptObjects.cpp
===================================================================
RCS file: /cvsroot/spherescript/SphereScript/CScriptObjects.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CScriptObjects.cpp	2001/06/05 20:31:08	1.1
--- CScriptObjects.cpp	2001/06/13 03:35:20	1.2
***************
*** 2195,2198 ****
--- 2195,2200 ----
  						pLoc->m_csFilename = csFile;
  						this->m_aLocations.Add(pLoc);
+ 						if ( pLoc->m_csFilename.Find("custloc.scp") != -1 )
+ 							pLoc->m_bCustom = true;
  					}
  					break;