[Sphere-axis-commits] CVS: Axis/S_Sphere52 ProfileEdit.cpp,1.6,1.7 serverconfigdlg.cpp,1.2,1.3 SkillTableEditDlg.cpp,1.3,1.4 SpawnGroupEditDlg.cpp,1.2,1.3 SpellEditDlg.cpp,1.3,1.4

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

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

Modified Files:
	ProfileEdit.cpp serverconfigdlg.cpp SkillTableEditDlg.cpp 
	SpawnGroupEditDlg.cpp SpellEditDlg.cpp 
Log Message:
no message

Index: ProfileEdit.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ProfileEdit.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ProfileEdit.cpp	23 Jul 2003 19:10:57 -0000	1.6
--- ProfileEdit.cpp	29 Jul 2003 21:15:37 -0000	1.7
***************
*** 390,393 ****
--- 390,394 ----
  	UpdateData();
  	HTREEITEM hRoot = m_tcScripts.GetRootItem();
+ 	sa.RemoveAll();
  	GetSelections(hRoot, m_sBasePath, sa);
  }

Index: serverconfigdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/serverconfigdlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** serverconfigdlg.cpp	9 Jul 2003 19:57:25 -0000	1.2
--- serverconfigdlg.cpp	29 Jul 2003 21:15:37 -0000	1.3
***************
*** 328,336 ****
  	// Read the gray.ini file
  	CStdioFile csfIniFile;
  	if (Main->GetProfileType() == PROFILE_REMOTE)
  	{
  		Main->m_pAxis->GetRemoteFile(_T("sphere.ini"), _T("sphere.ini"));
  	}
! 	if (csfIniFile.Open(Main->GetProfileType() == PROFILE_REMOTE ? RMT_INI_FILE : INI_FILE, CFile::modeRead | CFile::shareDenyNone))
  	{
  		CString csLine;
--- 328,340 ----
  	// Read the gray.ini file
  	CStdioFile csfIniFile;
+ 	CString sFile;
  	if (Main->GetProfileType() == PROFILE_REMOTE)
  	{
  		Main->m_pAxis->GetRemoteFile(_T("sphere.ini"), _T("sphere.ini"));
+ 		sFile.Format(_T("%s%s\\sphere.ini"), Main->m_pScripts->Profile()->BaseDirectory(), Main->m_pScripts->Profile()->ProfileName());
  	}
! 	else
!         sFile.Format(_T("%ssphere.ini"), Main->m_pScripts->Profile()->BaseDirectory());
! 	if (csfIniFile.Open(sFile, CFile::modeRead | CFile::shareDenyNone))
  	{
  		CString csLine;

Index: SkillTableEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SkillTableEditDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SkillTableEditDlg.cpp	11 Jul 2003 17:25:25 -0000	1.3
--- SkillTableEditDlg.cpp	29 Jul 2003 21:15:37 -0000	1.4
***************
*** 133,139 ****
  		{
  			CTSkillDef skill;
! 			skill.m_csFilename = pBase->m_csFilename;
! 			skill.m_csValue = pBase->m_csValue;
! 			skill.Load(_T("SKILL "));
  			int iIndex = this->m_ccbSkills.AddString(skill.m_csKey);
  			this->m_ccbSkills.SetItemData(iIndex, i);
--- 133,138 ----
  		{
  			CTSkillDef skill;
! 			skill.CopyBase(pBase);
! 			skill.Load(_T("[SKILL %s]"));
  			int iIndex = this->m_ccbSkills.AddString(skill.m_csKey);
  			this->m_ccbSkills.SetItemData(iIndex, i);
***************
*** 228,234 ****
  	m_pCurrentSkill = new CTSkillDef;
  	CScriptBase * pBase = (CScriptBase *) this->m_ccbSkills.GetItemDataPtr(iSel);
! 	m_pCurrentSkill->m_csFilename = pBase->m_csFilename;
! 	m_pCurrentSkill->m_csValue = pBase->m_csValue;
! 	m_pCurrentSkill->Load(_T("SKILL "));
  	CString csVal;
  	csVal.Format(_T("%ld"), this->m_pCurrentSkill->m_bStatBonus[STAT_DEX]);
--- 227,232 ----
  	m_pCurrentSkill = new CTSkillDef;
  	CScriptBase * pBase = (CScriptBase *) this->m_ccbSkills.GetItemDataPtr(iSel);
! 	m_pCurrentSkill->CopyBase(pBase);
! 	m_pCurrentSkill->Load(_T("[SKILL %s]"));
  	CString csVal;
  	csVal.Format(_T("%ld"), this->m_pCurrentSkill->m_bStatBonus[STAT_DEX]);

Index: SpawnGroupEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpawnGroupEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SpawnGroupEditDlg.cpp	11 Jul 2003 17:25:25 -0000	1.2
--- SpawnGroupEditDlg.cpp	29 Jul 2003 21:15:37 -0000	1.3
***************
*** 208,217 ****
  {
  	CString csCategory;
! 	m_ccbCategory.GetLBText(m_ccbCategory.GetCurSel(), csCategory);
  	if ( (csCategory != _T("")))
  	{
- 		int iSel = m_ccbCategory.GetCurSel();
- 		if (iSel == -1)
- 			return;
  		CCategory * pCategory = (CCategory *) m_ccbCategory.GetItemData(iSel);
  		if (pCategory == NULL)
--- 208,217 ----
  {
  	CString csCategory;
! 	int iSel = m_ccbCategory.GetCurSel();
! 	if ( iSel == -1 )
! 		return;
! 	m_ccbCategory.GetLBText(iSel, csCategory);
  	if ( (csCategory != _T("")))
  	{
  		CCategory * pCategory = (CCategory *) m_ccbCategory.GetItemData(iSel);
  		if (pCategory == NULL)

Index: SpellEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/SpellEditDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SpellEditDlg.cpp	11 Jul 2003 17:25:25 -0000	1.3
--- SpellEditDlg.cpp	29 Jul 2003 21:15:37 -0000	1.4
***************
*** 234,240 ****
  			continue;
  		CTSpellDef spell;
! 		spell.m_csValue = pBase->m_csValue;
! 		spell.m_csFilename = pBase->m_csFilename;
! 		spell.Load(_T("spell "));
  		int index = this->m_ccbSpellList.AddString(spell.m_csName);
  		this->m_ccbSpellList.SetItemData(index, i);
--- 234,239 ----
  			continue;
  		CTSpellDef spell;
! 		spell.CopyBase(pBase);
! 		spell.Load(_T("[spell %s]"));
  		int index = this->m_ccbSpellList.AddString(spell.m_csName);
  		this->m_ccbSpellList.SetItemData(index, i);
***************
*** 349,355 ****
  		CScriptBase * pBase = (CScriptBase *) m_ccbSpellList.GetItemData(iIndex);
  		this->m_pSpell = new CTSpellDef;
! 		m_pSpell->m_csFilename = pBase->m_csFilename;
! 		m_pSpell->m_csValue = pBase->m_csValue;
! 		m_pSpell->Load(_T("spell "));
  		// Fill this stuff in
  		if (this->m_pSpell != NULL)
--- 348,353 ----
  		CScriptBase * pBase = (CScriptBase *) m_ccbSpellList.GetItemData(iIndex);
  		this->m_pSpell = new CTSpellDef;
! 		m_pSpell->CopyBase(pBase);
! 		m_pSpell->Load(_T("[spell %s]"));
  		// Fill this stuff in
  		if (this->m_pSpell != NULL)