[Sphere-axis-commits] CVS: Axis/S_Sphere52 ScriptsMain.cpp,1.19,1.20 ScriptsMain.h,1.10,1.11 ScriptTables.cpp,1.4,1.5

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

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

Modified Files:
	ScriptsMain.cpp ScriptsMain.h ScriptTables.cpp 
Log Message:
no message

Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** ScriptsMain.cpp	25 Jun 2003 22:55:58 -0000	1.19
--- ScriptsMain.cpp	26 Jun 2003 22:28:03 -0000	1.20
***************
*** 24,27 ****
--- 24,37 ----
  #include <direct.h>
  #include "MD5Hash.h"
+ #include "FileMap.h"
+ 
+ CString TranslateFilename(CString sFile)
+ {
+ 	CFileMap mapping(sFile);
+ 	if ( mapping.Load() )
+ 		return mapping.RemoteName();
+ 	else
+ 		return sFile;
+ }
  
  int CScriptsMain::m_iScriptSeq = 0;
***************
*** 86,89 ****
--- 96,101 ----
  	m_pDlg = NULL;
  	m_pProfile = NULL;
+ 	m_bBrainsFound = false;
+ 	m_bMidisFound = false;
  }
  
***************
*** 93,96 ****
--- 105,111 ----
  	if ( m_pProfile != NULL )
  		delete m_pProfile;
+ 	m_vFiles.erase(m_vFiles.begin(), m_vFiles.end());
+ 	m_vBrains.erase(m_vBrains.begin(), m_vBrains.end());
+ 	m_vMidis.erase(m_vMidis.begin(), m_vMidis.end());
  }
  
***************
*** 180,190 ****
  		if ( csFilename == _T("") )
  			continue;
  		if ( !csfDefs.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			break;
  		}
  
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 195,206 ----
  		if ( csFilename == _T("") )
  			continue;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if ( !csfDefs.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			break;
  		}
  
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 281,291 ****
  		if ( csFilename == _T("") )
  			continue;
  		if ( !csfItems.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			break;
  		}
  
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 297,308 ----
  		if ( csFilename == _T("") )
  			continue;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if ( !csfItems.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			break;
  		}
  
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 409,418 ****
  		if ( csFilename == _T("") )
  			continue;
  		if ( !csfChars.Open(csFilename, CFile::modeRead | CFile::shareDenyNone) )
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			break;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 426,436 ----
  		if ( csFilename == _T("") )
  			continue;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if ( !csfChars.Open(csFilename, CFile::modeRead | CFile::shareDenyNone) )
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			break;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 534,543 ****
  		if ( csFilename == _T("") )
  			break;
  		if ( !csfTemplates.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			break;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 552,562 ----
  		if ( csFilename == _T("") )
  			break;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if ( !csfTemplates.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			break;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 710,719 ****
  			continue;
  
  		if (!csfMapfile.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			continue;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 729,739 ----
  			continue;
  
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if (!csfMapfile.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			continue;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 953,962 ****
  		if ( csFilename == _T("") )
  			continue;
  		if (!csfTrigfile.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			break;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 973,983 ----
  		if ( csFilename == _T("") )
  			continue;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if (!csfTrigfile.Open(csFilename, CFile::modeRead | CFile::shareDenyNone))
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			break;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 1047,1056 ****
  		if ( sFilename == _T("") )
  			continue;
  		if ( !csfLocs.Open( sFilename, CFile::modeRead | CFile::shareDenyNone) )
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), i ? USER_LOC_FILE : LOC_FILE );
  			continue;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), i ? USER_LOC_FILE : LOC_FILE );
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 1068,1078 ----
  		if ( sFilename == _T("") )
  			continue;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(sFilename));
  		if ( !csfLocs.Open( sFilename, CFile::modeRead | CFile::shareDenyNone) )
  		{
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(sFilename) );
  			continue;
  		}
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(sFilename) );
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 1069,1075 ****
  			if ( csLine.Find(_T("[LOCATION")) != -1 || csLine.Find(_T("[CUSTOM LOC")) != -1)
  			{
! 				CLocation * pLoc = new (CLocation);
  				if ( !pLoc )
  					break;
  				pLoc->m_bCustom = i ? true : false;
  				pLoc->Read(csfLocs);
--- 1091,1103 ----
  			if ( csLine.Find(_T("[LOCATION")) != -1 || csLine.Find(_T("[CUSTOM LOC")) != -1)
  			{
! 				CLocation * pLoc = new CLocation;
  				if ( !pLoc )
  					break;
+ 				CString sValue;
+ 				if ( csLine.Find(_T("[LOCATION")) != -1 )
+ 					sValue = csLine.Mid(csLine.Find(_T("[LOCATION")) + 10).SpanExcluding(_T("]"));
+ 				else
+ 					sValue = csLine.Mid(csLine.Find(_T("[CUSTOM LOC")) + 12).SpanExcluding(_T("]"));
+ 				pLoc->m_csValue = sValue;
  				pLoc->m_bCustom = i ? true : false;
  				pLoc->Read(csfLocs);
***************
*** 1151,1161 ****
  	if ( csFilename == _T(""))
  		return;
  	if ( !csfNames.Open(csFilename, CFile::modeRead | CFile::shareDenyNone) )
  	{
! 		LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  		return;
  	}
  
! 	csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  	m_pDlg->m_csMessage.SetWindowText(csMessage);
  	m_pDlg->SetPos(0);
--- 1179,1190 ----
  	if ( csFilename == _T(""))
  		return;
+ 	LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  	if ( !csfNames.Open(csFilename, CFile::modeRead | CFile::shareDenyNone) )
  	{
! 		LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  		return;
  	}
  
! 	csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  	m_pDlg->m_csMessage.SetWindowText(csMessage);
  	m_pDlg->SetPos(0);
***************
*** 1273,1276 ****
--- 1302,1306 ----
  		if ( csFilename == _T("") )
  			continue;
+ 		LOG(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		if ( !csfSpeech.Open(csFilename, CFile::modeRead | CFile::shareDenyNone) )
  		{
***************
*** 1283,1291 ****
  				csFilename.Format(_T("%s\\%s"), szPath, csFilename);
  			}
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  			continue;
  		}
  
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFilename);
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
--- 1313,1321 ----
  				csFilename.Format(_T("%s\\%s"), szPath, csFilename);
  			}
! 			LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  			continue;
  		}
  
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFilename));
  		m_pDlg->m_csMessage.SetWindowText(csMessage);
  		m_pDlg->SetPos(0);
***************
*** 1508,1515 ****
  	try
  	{
! 		LOG( locale->String(IDS_SCRIPTS_ATTEMPTINGLOAD), csFile);
  		if ( !csfInput.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
  		{
! 			LOG( locale->String(IDS_SCRIPTS_CANTOPEN), csFile);
  			return false;
  		}
--- 1538,1545 ----
  	try
  	{
! 		LOG( locale->String(IDS_SCRIPTS_ATTEMPTINGLOAD), TranslateFilename(csFile));
  		if ( !csfInput.Open(csFile, CFile::modeRead | CFile::shareDenyNone) )
  		{
! 			LOG( locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFile));
  			return false;
  		}
***************
*** 1517,1521 ****
  		
  		CString csMessage;
! 		csMessage.Format(locale->String(IDS_READINGFILE), csFile);
  		if ( m_pDlg )
  		{
--- 1547,1551 ----
  		
  		CString csMessage;
! 		csMessage.Format(locale->String(IDS_READINGFILE), TranslateFilename(csFile));
  		if ( m_pDlg )
  		{
***************
*** 2025,2029 ****
  					break;
  				default:
! 					LOG( locale->String(IDS_SCRIPTS_UNKNOWNSECTION), csLine, csFile);
  					break;
  				}
--- 2055,2059 ----
  					break;
  				default:
! 					LOG( locale->String(IDS_SCRIPTS_UNKNOWNSECTION), csLine, TranslateFilename(csFile));
  					break;
  				}
***************
*** 2109,2112 ****
--- 2139,2155 ----
  		}
  		Main->m_pAxis->Logout();
+ 		// Make sure we know where to get the location files
+ 		if ( m_vFiles[File_Loc] == _T("") )
+ 		{
+ 			CString sFile;
+ 			sFile.Format(_T("%s\\%s"), cwd, LOC_FILE);
+ 			m_vFiles[File_Loc] = sFile;
+ 		}
+ 		if ( m_vFiles[File_Loc2] == _T("") )
+ 		{
+ 			CString sFile;
+ 			sFile.Format(_T("%s\\%s"), cwd, USER_LOC_FILE);
+ 			m_vFiles[File_Loc2] = sFile;
+ 		}
  		// If Axiscats is defined, then load it
  		if ( m_vFiles[File_AxisCats] != _T("") )
***************
*** 2425,2431 ****
  		CString s;
  		if ( sCat == _T("") )
! 			s.Format(_T("<uncategorized>\\%s"),  pItem->m_csFilename);
  		else
! 			s.Format(_T("%s\\%s"), sCat, sSub);
  		return s;
  	}
--- 2468,2474 ----
  		CString s;
  		if ( sCat == _T("") )
! 			s = _T("<uncategorized>\\") + TranslateFilename(pItem->m_csFilename);
  		else
! 			s = sCat + _T("\\") + sSub;
  		return s;
  	}
***************
*** 2441,2445 ****
  				return sCategory;
  		}
! 		return pTemplate->m_csFilename;
  	}
  	index -= (ULONG) m_aTemplates.GetCount();
--- 2484,2488 ----
  				return sCategory;
  		}
! 		return (_T("<uncategorized>\\") + TranslateFilename(pTemplate->m_csFilename));
  	}
  	index -= (ULONG) m_aTemplates.GetCount();
***************
*** 2454,2458 ****
  				return sCategory;
  		}
! 		return pTemplate->m_csFilename;		
  	}
  	return _T("");
--- 2497,2501 ----
  				return sCategory;
  		}
! 		return (_T("<uncategorized>\\") + TranslateFilename(pTemplate->m_csFilename));
  	}
  	return _T("");
***************
*** 2576,2580 ****
  		if ( pItem->m_bNoIndex )
  			return pItem->m_bNoIndex;
! 		if ( pDupe->m_bNoIndex )
  			return pDupe->m_bNoIndex;
  		return false;
--- 2619,2623 ----
  		if ( pItem->m_bNoIndex )
  			return pItem->m_bNoIndex;
! 		if ( pDupe && pDupe->m_bNoIndex )
  			return pDupe->m_bNoIndex;
  		return false;
***************
*** 2617,2627 ****
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC != NULL )
! 		{
! 			CString sCategory = pNPC->m_csCategory + _T("\\") + pNPC->m_csSubsection;
! 			return sCategory;
! 		}
! 		else
  			return _T("");
  	}
  	index -= (ULONG) m_aNPCs.GetCount();
--- 2660,2678 ----
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC == NULL )
  			return _T("");
+ 		CDisplayedScriptBase * pDupe = FindDupe(pNPC, &m_aNPCs);
+ 		CString sCat = pNPC->m_csCategory;
+ 		if ( sCat == _T("") && pDupe )
+ 			sCat = pDupe->m_csCategory;
+ 		CString sSub = pNPC->m_csSubsection;
+ 		if ( sSub == _T("") && pDupe )
+ 			sSub = pDupe->m_csSubsection;
+ 		CString s;
+ 		if ( sCat == _T("") )
+ 			s = _T("<uncategorized>\\") + TranslateFilename(pNPC->m_csFilename);
+ 		else
+ 			s = sCat + _T("\\") + sSub;
+ 		return s;
  	}
  	index -= (ULONG) m_aNPCs.GetCount();
***************
*** 2632,2636 ****
  		{
  			CString sCategory = pSpawn->m_csCategory + _T("\\") + pSpawn->m_csSubsection;
! 			return sCategory;
  		}
  	}
--- 2683,2690 ----
  		{
  			CString sCategory = pSpawn->m_csCategory + _T("\\") + pSpawn->m_csSubsection;
! 			if ( sCategory != _T("\\") )
! 				return sCategory;
! 			else
! 				return ( _T("<uncategorized>\\") + TranslateFilename(pSpawn->m_csFilename));
  		}
  	}
***************
*** 2643,2650 ****
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC != NULL )
! 			return pNPC->m_csDescription;
! 		else
  			return _T("");
  	}
  	index -= (ULONG) m_aNPCs.GetCount();
--- 2697,2711 ----
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC == NULL )
  			return _T("");
+ 		CDisplayedScriptBase * pDupe = FindDupe(pNPC, &m_aNPCs);
+ 		CString sSub = pNPC->m_csSubsection;
+ 		if ( sSub == _T("") && pDupe )
+ 			sSub = pDupe->m_csSubsection;
+ 		CString s = pNPC->m_csDescription;
+ 		if ( s == _T("") && pDupe )
+ 			s = pDupe->m_csDescription;
+ 		s.Replace(_T("@"), sSub);
+ 		return s;
  	}
  	index -= (ULONG) m_aNPCs.GetCount();
***************
*** 2663,2673 ****
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC != NULL )
! 			if ( pNPC->m_csDispID != _T("") )
! 				return pNPC->m_csDispID;
! 			else
! 				return pNPC->m_csValue;
! 		else
  			return _T("");
  	}
  	// Spawn Groups have no DispID
--- 2724,2736 ----
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC == NULL )
  			return _T("");
+ 		CDisplayedScriptBase * pDupe = FindDupe(pNPC, &m_aNPCs);
+ 		CString sDispID = pNPC->m_csDispID;
+ 		if ( sDispID == _T("") && pDupe )
+ 			sDispID = pDupe->m_csDispID;
+ 		if ( sDispID == _T("") )
+ 			sDispID = pNPC->m_csValue;
+ 		return sDispID;
  	}
  	// Spawn Groups have no DispID
***************
*** 2680,2687 ****
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC != NULL )
! 			return pNPC->m_csColor;
! 		else
  			return _T("");
  	}
  	// Spawn Groups have no Color
--- 2743,2754 ----
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC == NULL )
  			return _T("");
+ 		CDisplayedScriptBase * pDupe = FindDupe(pNPC, &m_aNPCs);
+ 		CString sColor = pNPC->m_csColor;
+ 		if ( sColor == _T("") && pDupe )
+ 			return pDupe->m_csColor;
+ 		else
+ 			return sColor;
  	}
  	// Spawn Groups have no Color
***************
*** 2714,2721 ****
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC != NULL )
! 			return false;
! 		else
  			return true;
  	}
  	// Spawn Groups can only be spawned
--- 2781,2788 ----
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC == NULL )
  			return true;
+ 		else
+ 			return false;
  	}
  	// Spawn Groups can only be spawned
***************
*** 2729,2736 ****
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC != NULL )
! 			return pNPC->m_bNoIndex;
! 		else
  			return true;
  	}
  	index -= (ULONG) m_aNPCs.GetCount();
--- 2796,2807 ----
  	{
  		CDisplayedScriptBase * pNPC = m_aNPCs[index];
! 		if ( pNPC == NULL )
  			return true;
+ 		if ( pNPC->m_bNoIndex )
+ 			return pNPC->m_bNoIndex;
+ 		CDisplayedScriptBase * pDupe = FindDupe(pNPC, &m_aNPCs);
+ 		if ( pDupe != NULL )
+ 			return pDupe->m_bNoIndex;
+ 		return false;
  	}
  	index -= (ULONG) m_aNPCs.GetCount();
***************
*** 2838,2842 ****
  			CString sCategory;
  			sCategory = pLoc->m_csCategory + _T("\\") + pLoc->m_csSubsection;
! 			return sCategory;
  		}
  	}
--- 2909,2916 ----
  			CString sCategory;
  			sCategory = pLoc->m_csCategory + _T("\\") + pLoc->m_csSubsection;
! 			if ( sCategory != _T("\\") )
! 				return sCategory;
! 			else
! 				return ( _T("<uncategorized>\\") + TranslateFilename(pLoc->m_csFilename) );
  		}
  	}
***************
*** 2849,2854 ****
  	{
  		CLocation * pLoc = m_aLocations[index];
! 		if ( pLoc != NULL )
  			return pLoc->m_csDescription;
  	}
  	return _T("");
--- 2923,2932 ----
  	{
  		CLocation * pLoc = m_aLocations[index];
! 		if ( pLoc == NULL ) 
! 			return _T("");
! 		if ( pLoc->m_csDescription != _T("") )
  			return pLoc->m_csDescription;
+ 		else
+ 			return _T("<unnamed>");
  	}
  	return _T("");
***************
*** 3232,3251 ****
  ULONG CScriptsMain::BrainCount()
  {
! 	return 0;
  }
  
  CString CScriptsMain::BrainDescription(ULONG index)
  {
! 	return _T("");
  }
  
  ULONG CScriptsMain::MidiCount()
  {
! 	return 0;
  }
  
  CString CScriptsMain::MidiName(ULONG index)
  {
! 	return _T("");
  }
  
--- 3310,3335 ----
  ULONG CScriptsMain::BrainCount()
  {
! 	FindBrains();
! 	return (ULONG) m_vBrains.size();
  }
  
  CString CScriptsMain::BrainDescription(ULONG index)
  {
! 	if ( index > m_vBrains.size() || index < 0 )
! 		return _T("");
! 	return m_vBrains[index];
  }
  
  ULONG CScriptsMain::MidiCount()
  {
! 	FindMidis();
! 	return (ULONG) m_vMidis.size();
  }
  
  CString CScriptsMain::MidiName(ULONG index)
  {
! 	if ( index > m_vMidis.size() || index < 0 )
! 		return _T("");
! 	return m_vMidis[index];
  }
  
***************
*** 3288,3289 ****
--- 3372,3402 ----
  		return dynamic_cast<CDisplayedScriptBase *>(array->GetAt(iDupe));
  }
+ 
+ void CScriptsMain::FindBrains()
+ {
+ 	if ( m_bBrainsFound )
+ 		return;
+ 	m_vBrains.erase(m_vBrains.begin(), m_vBrains.end());
+ 	for ( int i = 0; i < (int) m_aDefs.GetCount(); i++ )
+ 	{
+ 		CDef * pDef = m_aDefs[i];
+ 		if ( pDef->m_csGroup == _T("BRAINS") )
+ 			m_vBrains.push_back(pDef->m_csValue);
+ 	}
+ 	m_bBrainsFound = true;
+ }
+ 
+ void CScriptsMain::FindMidis()
+ {
+ 	if ( m_bMidisFound )
+ 		return;
+ 	m_vMidis.erase(m_vMidis.begin(), m_vMidis.end());
+ 	for ( int i = 0; i < (int) m_aDefs.GetCount(); i++ )
+ 	{
+ 		CDef * pDef = m_aDefs[i];
+ 		if ( pDef->m_csGroup == _T("MIDIS") )
+ 			m_vMidis.push_back(pDef->m_csValue);
+ 	}
+ 	m_bMidisFound = true;
+ }
+ 

Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ScriptsMain.h	25 Jun 2003 22:55:58 -0000	1.10
--- ScriptsMain.h	26 Jun 2003 22:28:04 -0000	1.11
***************
*** 78,81 ****
--- 78,83 ----
  #define PROFILE_REMOTE 3
  
+ CString TranslateFilename(CString sFile);
+ 
  class CScriptsMain
  {
***************
*** 318,320 ****
--- 320,329 ----
  	int MapFile(CString s);
  	CDisplayedScriptBase * FindDupe(CDisplayedScriptBase * pScript, CScriptArray<CDisplayedScriptBase*> *array);
+ 
+ 	vector<CString> m_vBrains;
+ 	bool m_bBrainsFound;
+ 	void FindBrains();
+ 	vector <CString> m_vMidis;
+ 	bool m_bMidisFound;
+ 	void FindMidis();
  };

Index: ScriptTables.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptTables.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ScriptTables.cpp	11 Jun 2003 22:18:11 -0000	1.4
--- ScriptTables.cpp	26 Jun 2003 22:28:04 -0000	1.5
***************
*** 99,104 ****
  			csFilename.Format(_T("%s\\%s"), szPath, csFilename);
  		}
! 		LOG(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
! 		csMessage.Format(locale->String(IDS_SCRIPTS_CANTOPEN), csFilename);
  		AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
  		return false;
--- 99,104 ----
  			csFilename.Format(_T("%s\\%s"), szPath, csFilename);
  		}
! 		LOG(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
! 		csMessage.Format(locale->String(IDS_SCRIPTS_CANTOPEN), TranslateFilename(csFilename));
  		AfxMessageBox(csMessage, MB_OK | MB_ICONEXCLAMATION);
  		return false;