[Sphere-axis-commits] CVS: Axis/S_Sphere52 MapScriptEditDlg.cpp,1.5,1.6 ScriptsMain.cpp,1.25,1.26 ScriptsMain.h,1.16,1.17 XMLConfig.cpp,1.5,1.6 XMLConfig.h,1.5,1.6

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

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

Modified Files:
	MapScriptEditDlg.cpp ScriptsMain.cpp ScriptsMain.h 
	XMLConfig.cpp XMLConfig.h 
Log Message:
no message

Index: MapScriptEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/MapScriptEditDlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** MapScriptEditDlg.cpp	10 Jul 2003 05:13:37 -0000	1.5
--- MapScriptEditDlg.cpp	16 Jul 2003 22:01:58 -0000	1.6
***************
*** 160,178 ****
  
  	FillValues();
! 
! 	m_map.SetClientPath(Main->m_config.MulPath());
! 
! 	if ( Main->m_config.MulFile(Map0) != _T("") )
! 		m_map.SetCustomMulPath(Map0, Main->m_config.MulFile(Map0));
! 	if ( Main->m_config.MulFile(Map2) != _T("") )
! 		m_map.SetCustomMulPath(Map2, Main->m_config.MulFile(Map2));
! 	if ( Main->m_config.MulFile(StaIdx0) != _T("") )
! 		m_map.SetCustomMulPath(StaIdx0, Main->m_config.MulFile(StaIdx0));
! 	if ( Main->m_config.MulFile(Statics0) != _T("") )
! 		m_map.SetCustomMulPath(Statics0, Main->m_config.MulFile(Statics0));
! 	if ( Main->m_config.MulFile(StaIdx2) != _T("") )
! 		m_map.SetCustomMulPath(StaIdx2, Main->m_config.MulFile(StaIdx2));
! 	if ( Main->m_config.MulFile(Statics2) != _T("") )
! 		m_map.SetCustomMulPath(Statics2, Main->m_config.MulFile(Statics2));
  
  	GetRects();
--- 160,170 ----
  
  	FillValues();
! 	m_map.SetClientPath(Main->m_pScripts->MulPath());
! 	for ( ULONG i = Map0; i < MulCount; i++ )
! 	{
! 		CString s = Main->m_pScripts->MulFile(i);
! 		if ( s != _T("") )
! 			m_map.SetCustomMulPath((short) i, s);
! 	}
  
  	GetRects();

Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** ScriptsMain.cpp	15 Jul 2003 21:45:01 -0000	1.25
--- ScriptsMain.cpp	16 Jul 2003 22:01:59 -0000	1.26
***************
*** 3473,3480 ****
  void CScriptsMain::SetMulFile(ULONG index, CString sFile)
  {
! 	if ( index >= VERFILE_ENDOFTABLE )
  		return;
  	if ( index > m_vFiles.size() )
  		m_vMulFiles.resize(index, _T("") );
  	m_vMulFiles[index] = sFile;
  }
--- 3473,3488 ----
  void CScriptsMain::SetMulFile(ULONG index, CString sFile)
  {
! 	if ( index >= MulCount )
  		return;
  	if ( index > m_vFiles.size() )
  		m_vMulFiles.resize(index, _T("") );
  	m_vMulFiles[index] = sFile;
+ }
+ 
+ CString CScriptsMain::MulFile(ULONG index)
+ {
+ 	if ( index < 0 || index > m_vMulFiles.size() )
+ 		return _T("");
+ 	else
+ 		return m_vMulFiles[index];
  }

Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** ScriptsMain.h	15 Jul 2003 21:45:01 -0000	1.16
--- ScriptsMain.h	16 Jul 2003 22:01:59 -0000	1.17
***************
*** 79,142 ****
  #define PROFILE_REMOTE 3
  
! #define VERFILE_MAP0 0x00
! #define VERFILE_STAIDX0 0x01
! #define VERFILE_STATICS0 0x02
! #define VERFILE_ARTIDX 0x03
! #define VERFILE_ART 0x04
! #define VERFILE_ANIMIDX 0x05
! #define VERFILE_ANIM 0x06
! #define VERFILE_SOUNDIDX 0x07
! #define VERFILE_SOUND 0x08
! #define VERFILE_TEXIDX 0x09
! #define VERFILE_TEXMAPS 0x0a
! #define VERFILE_GUMPIDX 0x0b
! #define VERFILE_GUMPART 0x0c
! #define VERFILE_MULTIIDX 0x0d
! #define VERFILE_MULTI 0x0e
! #define VERFILE_SKILLSIDX 0x0f
! #define VERFILE_SKILLS 0x10
! #define VERFILE_LIGHTIDX 0x11 // ???
! #define VERFILE_LIGHT 0x12 // ???
! #define VERFILE_TILEDATA	0x1e
! #define VERFILE_ANIMDATA 0x1f
! #define VERFILE_HUES 0x20
! // don't know about these...so we'll assign them numbers for now
! #define VERFILE_ANIMINFO 0x21
! #define VERFILE_FONTS 0x22
! #define VERFILE_RADARCOL 0x23
! #define VERFILE_VERDATA 0x24
! #define VERFILE_MAP2 0x25
! #define VERFILE_STAIDX2 0x26
! #define VERFILE_STATICS2 0x27
! #define VERFILE_ANIM2 0x28
! #define VERFILE_ANIMIDX2 0x29
! 
! #define VERFILE_MAP3 0x30
! #define VERFILE_STAIDX3 0x31
! #define VERFILE_STATICS3 0x32
! #define VERFILE_ANIM3 0x33
! #define VERFILE_ANIMIDX3 0x34
! #define VERFILE_MAPDIF3 0x35
! #define VERFILE_MAPDIFL3 0x36
! #define VERFILE_STADIF3 0x37
! #define VERFILE_STADIFI3 0x38
! #define VERFILE_STADIFL3 0x39
! 
! #define VERFILE_MAPDIF0 0x40
! #define VERFILE_MAPDIF1 0x41
! #define VERFILE_MAPDIF2 0x42
! #define VERFILE_MAPDIFL0 0x43
! #define VERFILE_MAPDIFL1 0x44
! #define VERFILE_MAPDIFL2 0x45
! #define VERFILE_STADIF0 0x46
! #define VERFILE_STADIF1 0x47
! #define VERFILE_STADIF2 0x48
! #define VERFILE_STADIFI0 0x49
! #define VERFILE_STADIFI1 0x4a
! #define VERFILE_STADIFI2 0x4b
! #define VERFILE_STADIFL0 0x4c
! #define VERFILE_STADIFL1 0x4d
! #define VERFILE_STADIFL2 0x4e
! #define VERFILE_ENDOFTABLE 0x4f
  
  CString TranslateFilename(CString sFile);
--- 79,143 ----
  #define PROFILE_REMOTE 3
  
! enum Muls
! {
! 	 Map0 = 0,
! 	 StaIdx0,
! 	 Statics0,
! 	 ArtIdx,
! 	 Art,
! 	 AnimIdx,
! 	 Anim,
! 	 SoundIdx,
! 	 Sound,
! 	 TexIdx,
! 	 Texmaps,	// 0x0A
! 	 GumpIdx,
! 	 Gump,
! 	 MultiIdx,
! 	 Multi,
! 	 SkillsIdx,
! 	 Skills,	// 0x10
! 	 LightIdx,
! 	 Lights,
! 	 Tiledata = 0x1e,
! 	 Animdata = 0x1f,
! 	 Hues,
! 	 Animinfo,
! 	 Fonts,
! 	 Radarcol,
! 	 Verdata,
! 	 Map2,
! 	 StaIdx2,
! 	 Statics2,
! 	 Anim2,
! 	 Anim2Idx,
! 	 Map3,
! 	 StaIdx3,
! 	 Statics3,
! 	 Anim3,
! 	 Anim3Idx,
! 	 // For some reason, the diff files are out of order in the ActiveX controls.
! 	 MapDif3,
! 	 MapDifl3,
! 	 StaDif3,
! 	 StaDifi3,
! 	 StaDifl3,
! 	 MapDif0,
! 	 MapDif1,
! 	 MapDif2,
!      MapDifl0,
! 	 MapDifl1,
! 	 MapDifl2,
! 	 StaDif0,
! 	 StaDif1,
! 	 StaDif2,
! 	 StaDifi0,
! 	 StaDifi1,
! 	 StaDifi2,
! 	 StaDifl0,
! 	 StaDifl1,
! 	 StaDifl2,
! 	 MulCount
! };
  
  CString TranslateFilename(CString sFile);
***************
*** 200,203 ****
--- 201,207 ----
  	bool WriteTeleporters(CString sTargetFile, CStdioFile &csfOutput);
  	bool WriteMoongates(CString sTargetFile, CStdioFile &csfOutput);
+ 
+ 	CString MulPath() { return m_sMulPath; }
+ 	CString MulFile(ULONG index);
  
  #define TEMPLATE_INDEX_BASE 101500

Index: XMLConfig.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/XMLConfig.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** XMLConfig.cpp	2 Jul 2003 13:54:17 -0000	1.5
--- XMLConfig.cpp	16 Jul 2003 22:01:59 -0000	1.6
***************
*** 23,27 ****
  {
  	m_iProfileCount = 0;
- 	m_sMulFiles.resize(MulCount, _T(""));
  }
  
--- 23,26 ----

Index: XMLConfig.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/XMLConfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** XMLConfig.h	2 Jul 2003 13:54:17 -0000	1.5
--- XMLConfig.h	16 Jul 2003 22:01:59 -0000	1.6
***************
*** 16,80 ****
  #endif
  
- enum Muls
- {
- 	 Map0 = 0,
- 	 StaIdx0,
- 	 Statics0,
- 	 ArtIdx,
- 	 Art,
- 	 AnimIdx,
- 	 Anim,
- 	 SoundIdx,
- 	 Sound,
- 	 TexIdx,
- 	 Texmaps,	// 0x0A
- 	 GumpIdx,
- 	 Gump,
- 	 MultiIdx,
- 	 Multi,
- 	 SkillsIdx,
- 	 Skills,	// 0x10
- 	 LightIdx,
- 	 Lights,
- 	 Tiledata = 0x1e,
- 	 Animdata = 0x1f,
- 	 Hues,
- 	 Animinfo,
- 	 Fonts,
- 	 Radarcol,
- 	 Verdata,
- 	 Map2,
- 	 StaIdx2,
- 	 Statics2,
- 	 Anim2,
- 	 Anim2Idx,
- 	 Map3,
- 	 StaIdx3,
- 	 Statics3,
- 	 Anim3,
- 	 Anim3Idx,
- 	 // For some reason, the diff files are out of order in the ActiveX controls.
- 	 MapDif3,
- 	 MapDifl3,
- 	 StaDif3,
- 	 StaDifi3,
- 	 StaDifl3,
- 	 MapDif0,
- 	 MapDif1,
- 	 MapDif2,
-      MapDifl0,
- 	 MapDifl1,
- 	 MapDifl2,
- 	 StaDif0,
- 	 StaDif1,
- 	 StaDif2,
- 	 StaDifi0,
- 	 StaDifi1,
- 	 StaDifi2,
- 	 StaDifl0,
- 	 StaDifl1,
- 	 StaDifl2,
- 	 MulCount
- };
  
  class CXMLConfig : public CXMLBase
--- 16,19 ----
***************
*** 92,99 ****
  	void AddProfile(CScriptProfile * pNewProfile);
  	void DeleteProfile(CScriptProfile * pProfile);
- 	CString MulPath() { return m_sMulPath; }
- 	CString MulFile(int index) { if ( index < MulCount && index >= Map0 ) return m_sMulFiles[index]; else return _T(""); }
- 	void MulPath(CString s) { m_sMulPath = s; }
- 	void MulFile(int index, CString s) { if ( index < MulCount && index >= Map0 ) m_sMulFiles[index] = s; }
  
  protected:
--- 31,34 ----
***************
*** 102,107 ****
  	xmlDocPtr m_pXMLDoc;
  	CString m_sLocaleFile;
- 	CString m_sMulPath;
- 	vector<CString> m_sMulFiles;
  
  	bool LoadFromRegistry();
--- 37,40 ----