[Sphere-axis-commits] CVS: Axis/S_Sphere52 MapScriptEditDlg.cpp,1.1,1.2 MapScriptEditDlg.h,1.1,1.2 R
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis/S_Sphere52 MapScriptEditDlg.cpp,1.1,1.2 MapScriptEditDlg.h,1.1,1.2 Resource.h,1.4,1.5 XMLConfig.cpp,1.4,1.5 XMLConfig.h,1.4,1.5
|
From: Philip E. <pes...@us...> - 2003-07-02 13:54:20
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv25558
Modified Files:
MapScriptEditDlg.cpp MapScriptEditDlg.h Resource.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.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MapScriptEditDlg.cpp 2 Jul 2003 00:13:30 -0000 1.1
--- MapScriptEditDlg.cpp 2 Jul 2003 13:54:17 -0000 1.2
***************
*** 257,261 ****
{
TV_KEYDOWN* pTVKeyDown = (TV_KEYDOWN*)pNMHDR;
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
if (pTVKeyDown->wVKey == VK_DELETE)
{
--- 257,261 ----
{
TV_KEYDOWN* pTVKeyDown = (TV_KEYDOWN*)pNMHDR;
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
if (pTVKeyDown->wVKey == VK_DELETE)
{
***************
*** 267,271 ****
if ( iVersion == 0 && pArea->m_bCustom == false )
{
! AxisMessageBox(locale->String(IDS_MAPSEDIT_CANTDELETE), MB_OK | MB_ICONINFORMATION );
return;
}
--- 267,271 ----
if ( iVersion == 0 && pArea->m_bCustom == false )
{
! AfxMessageBox(locale->String(IDS_MAPSEDIT_CANTDELETE), MB_OK | MB_ICONINFORMATION );
return;
}
***************
*** 291,295 ****
void CMapScriptEditDlg::OnNewroom()
{
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
HTREEITEM hParent = NULL;
HTREEITEM hTestItem = this->m_ctcRegionTree.GetRootItem();
--- 291,295 ----
void CMapScriptEditDlg::OnNewroom()
{
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
HTREEITEM hParent = NULL;
HTREEITEM hTestItem = this->m_ctcRegionTree.GetRootItem();
***************
*** 337,341 ****
void CMapScriptEditDlg::OnNewarea()
{
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
CAddValueDialog dlg;
if ( iVersion )
--- 337,341 ----
void CMapScriptEditDlg::OnNewarea()
{
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
CAddValueDialog dlg;
if ( iVersion )
***************
*** 391,395 ****
return;
}
! int version = m_ccbVersion.GetItemData(iSel);
Main->m_pScripts->SaveMap(version);
m_bIsActive = false;
--- 391,395 ----
return;
}
! int version = (int) m_ccbVersion.GetItemData(iSel);
Main->m_pScripts->SaveMap(version);
m_bIsActive = false;
***************
*** 562,567 ****
// Mapplane 0
m_iMapPlane = 0;
! X = (wParam / 512) * 8;
! Y = (wParam % 512) * 8;
m_map.SetMapFile(0);
}
--- 562,567 ----
// Mapplane 0
m_iMapPlane = 0;
! X = ((int) wParam / 512) * 8;
! Y = ((int) wParam % 512) * 8;
m_map.SetMapFile(0);
}
***************
*** 571,576 ****
m_iMapPlane = 2;
wParam %= (768 * 512);
! X = (wParam / 512 ) * 8;
! Y = (wParam % 512 ) * 8;
m_map.SetMapFile(2);
}
--- 571,576 ----
m_iMapPlane = 2;
wParam %= (768 * 512);
! X = ((int)wParam / 512 ) * 8;
! Y = ((int)wParam % 512 ) * 8;
m_map.SetMapFile(2);
}
***************
*** 606,610 ****
return;
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
// Do the common ones first
--- 606,610 ----
return;
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
// Do the common ones first
***************
*** 697,701 ****
m = m_iMapPlane;
CString csCoords;
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
if ( iVersion == 0 )
csCoords.Format(_T("%d, %d, %d"), x, y, z);
--- 697,701 ----
m = m_iMapPlane;
CString csCoords;
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
if ( iVersion == 0 )
csCoords.Format(_T("%d, %d, %d"), x, y, z);
***************
*** 711,715 ****
CArea * CMapScriptEditDlg::SetCustomArea(CArea *pArea)
{
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
if ( iVersion )
{
--- 711,715 ----
CArea * CMapScriptEditDlg::SetCustomArea(CArea *pArea)
{
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
if ( iVersion )
{
***************
*** 776,780 ****
CArea * pArea = (CArea *) this->m_ctcRegionTree.GetItemData( hSelItem );
CString csVal = this->m_clcValues.GetItemText( iSel, 1 );
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
string sCaption, sValue;
bool bSimple = true;
--- 776,780 ----
CArea * pArea = (CArea *) this->m_ctcRegionTree.GetItemData( hSelItem );
CString csVal = this->m_clcValues.GetItemText( iSel, 1 );
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
string sCaption, sValue;
bool bSimple = true;
***************
*** 1345,1349 ****
m_clcValues.DeleteAllItems();
// Change the options in the values box
! int iVersion = m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
switch (iVersion)
{
--- 1345,1349 ----
m_clcValues.DeleteAllItems();
// Change the options in the values box
! int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
switch (iVersion)
{
Index: MapScriptEditDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/MapScriptEditDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MapScriptEditDlg.h 2 Jul 2003 00:13:30 -0000 1.1
--- MapScriptEditDlg.h 2 Jul 2003 13:54:17 -0000 1.2
***************
*** 23,27 ****
//{{AFX_INCLUDES()
! #include "CDUOMap.h"
//}}AFX_INCLUDES
#if !defined(AFX_MAPSCRIPTEDITDLG_H__98315981_0270_11D3_8716_00805FD91B8C__INCLUDED_)
--- 23,27 ----
//{{AFX_INCLUDES()
! #include "uomap.h"
//}}AFX_INCLUDES
#if !defined(AFX_MAPSCRIPTEDITDLG_H__98315981_0270_11D3_8716_00805FD91B8C__INCLUDED_)
***************
*** 91,95 ****
CStatic m_csCursor;
CStatic m_csCoords;
! CDUOMap m_map;
//}}AFX_DATA
--- 91,95 ----
CStatic m_csCursor;
CStatic m_csCoords;
! CUOMap m_map;
//}}AFX_DATA
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Resource.h 1 Jul 2003 14:17:40 -0000 1.4
--- Resource.h 2 Jul 2003 13:54:17 -0000 1.5
***************
*** 53,56 ****
--- 53,57 ----
#define IDC_PROFILE_SAVE 231
#define IDC_PROFILE_DISCARD 232
+ #define IDC_UOMAPCTRL1 232
#define IDC_TRIGEDIT 1001
#define IDC_NPCATTRADD 1001
***************
*** 255,259 ****
#define _APS_NEXT_RESOURCE_VALUE 205
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 232
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 256,260 ----
#define _APS_NEXT_RESOURCE_VALUE 205
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 233
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: XMLConfig.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/XMLConfig.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** XMLConfig.cpp 13 Jun 2003 14:52:42 -0000 1.4
--- XMLConfig.cpp 2 Jul 2003 13:54:17 -0000 1.5
***************
*** 23,26 ****
--- 23,27 ----
{
m_iProfileCount = 0;
+ m_sMulFiles.resize(MulCount, _T(""));
}
Index: XMLConfig.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/XMLConfig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** XMLConfig.h 12 Jun 2003 23:27:01 -0000 1.4
--- XMLConfig.h 2 Jul 2003 13:54:17 -0000 1.5
***************
*** 5,8 ****
--- 5,11 ----
#include "XMLBase.h"
+ #include <vector>
+ using namespace std;
+
#ifndef PROFILE_LOCAL
#define PROFILE_UNDEFINED -1
***************
*** 13,16 ****
--- 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
***************
*** 28,31 ****
--- 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:
***************
*** 34,37 ****
--- 102,107 ----
xmlDocPtr m_pXMLDoc;
CString m_sLocaleFile;
+ CString m_sMulPath;
+ vector<CString> m_sMulFiles;
bool LoadFromRegistry();
|
