[Sphere-axis-commits] CVS: Axis/S_Sphere52 MapScriptEditDlg.cpp,1.2,1.3 MapScriptEditDlg.h,1.2,1.3 S
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis/S_Sphere52 MapScriptEditDlg.cpp,1.2,1.3 MapScriptEditDlg.h,1.2,1.3 ScriptsMain.cpp,1.21,1.22 ScriptsMain.h,1.12,1.13 strings.h,1.4,1.5
|
From: Philip E. <pes...@us...> - 2003-07-02 17:20:12
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv28726/S_Sphere52
Modified Files:
MapScriptEditDlg.cpp MapScriptEditDlg.h ScriptsMain.cpp
ScriptsMain.h strings.h
Log Message:
no message
Index: MapScriptEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/MapScriptEditDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MapScriptEditDlg.cpp 2 Jul 2003 13:54:17 -0000 1.2
--- MapScriptEditDlg.cpp 2 Jul 2003 17:20:08 -0000 1.3
***************
*** 388,392 ****
if ( iSel == -1 )
{
! AxisMessageBox(locale->String(IDS_MAPSEDIT_CHOOSEVERSION), MB_OK);
return;
}
--- 388,392 ----
if ( iSel == -1 )
{
! AfxMessageBox(locale->String(IDS_MAPSEDIT_CHOOSEVERSION), MB_OK);
return;
}
***************
*** 399,403 ****
void CMapScriptEditDlg::OnCancel()
{
! if (AxisMessageBox(locale->String(IDS_MAPSEDIT_WARNCANCEL), MB_YESNO | MB_ICONQUESTION) == IDYES)
CDialog::OnCancel();
--- 399,403 ----
void CMapScriptEditDlg::OnCancel()
{
! if (AfxMessageBox(locale->String(IDS_MAPSEDIT_WARNCANCEL), MB_YESNO | MB_ICONQUESTION) == IDYES)
CDialog::OnCancel();
***************
*** 777,781 ****
CString csVal = this->m_clcValues.GetItemText( iSel, 1 );
int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
! string sCaption, sValue;
bool bSimple = true;
// Some of these are just strings
--- 777,781 ----
CString csVal = this->m_clcValues.GetItemText( iSel, 1 );
int iVersion = (int) m_ccbVersion.GetItemData(m_ccbVersion.GetCurSel());
! CString sCaption, sValue;
bool bSimple = true;
// Some of these are just strings
***************
*** 798,843 ****
{
// Name of locals
! sCaption.assign(_T("Name for locals"));
! sValue.assign((LPCTSTR)pArea->m_csLocal);
}
break;
case 0:
! sCaption.assign(_T("Region Title"));
! sValue.assign((LPCTSTR)pArea->m_csTitle);
break;
case 1:
! sCaption.assign(_T("Classification Group"));
! sValue.assign((LPCTSTR)pArea->m_csGroup);
break;
case 2:
! sCaption.assign(_T("Teleport Point"));
! sValue.assign((LPCTSTR)pArea->m_csPoint);
break;
case 4:
! sCaption.assign(_T("Guard allegiance"));
! sValue.assign((LPCTSTR)pArea->m_csGuardOwner);
break;
case 5:
! sCaption.assign(_T("Chance of Weather"));
! sValue = FormatString(_T("%ld"), pArea->m_iRainChance);
break;
case 6:
! sCaption.assign(_T("Chance of Cold"));
! sValue = FormatString(_T("%ld"), pArea->m_iSnowChance);
break;
case 7:
! sCaption.assign(_T("Announcement"));
! sValue.assign(pArea->m_csAnnouncement);
break;
case 9:
if ( iVersion == 0 )
{
! sCaption.assign(_T("Region Trigger"));
! sValue = FormatString(_T("%ld"), pArea->m_dwTriggerID);
}
else
{
! sCaption.assign(_T("Defname"));
! sValue.assign(pArea->m_csDefname);
}
break;
--- 798,843 ----
{
// Name of locals
! sCaption =_T("Name for locals");
! sValue = pArea->m_csLocal;
}
break;
case 0:
! sCaption = _T("Region Title");
! sValue = pArea->m_csTitle;
break;
case 1:
! sCaption = _T("Classification Group");
! sValue = pArea->m_csGroup;
break;
case 2:
! sCaption = _T("Teleport Point");
! sValue = pArea->m_csPoint;
break;
case 4:
! sCaption = _T("Guard allegiance");
! sValue = pArea->m_csGuardOwner;
break;
case 5:
! sCaption = _T("Chance of Weather");
! sValue.Format(_T("%ld"), pArea->m_iRainChance);
break;
case 6:
! sCaption= _T("Chance of Cold");
! sValue.Format(_T("%ld"), pArea->m_iSnowChance);
break;
case 7:
! sCaption = _T("Announcement");
! sValue = pArea->m_csAnnouncement;
break;
case 9:
if ( iVersion == 0 )
{
! sCaption = _T("Region Trigger");
! sValue.Format(_T("%ld"), pArea->m_dwTriggerID);
}
else
{
! sCaption = _T("Defname");
! sValue = pArea->m_csDefname;
}
break;
***************
*** 845,855 ****
if ( iVersion == 0 )
{
! sCaption.assign(_T("Periodic Trigger"));
! sValue = FormatString(_T("%ld"), pArea->m_dwTrigPeriodic);
}
else
{
! sCaption.assign(_T("Class"));
! sValue = FormatString(_T("%ld"), pArea->m_iClass);
}
break;
--- 845,855 ----
if ( iVersion == 0 )
{
! sCaption = _T("Periodic Trigger");
! sValue.Format(_T("%ld"), pArea->m_dwTrigPeriodic);
}
else
{
! sCaption = _T("Class");
! sValue.Format(_T("%ld"), pArea->m_iClass);
}
break;
***************
*** 859,864 ****
CEditValueDlg dlg;
dlg.m_bTextMode = true;
! dlg.m_csCaption = sCaption.c_str();
! dlg.m_csTextValue = sValue.c_str();
if ( dlg.DoModal() == IDOK )
{
--- 859,864 ----
CEditValueDlg dlg;
dlg.m_bTextMode = true;
! dlg.m_csCaption = sCaption;
! dlg.m_csTextValue = sValue;
if ( dlg.DoModal() == IDOK )
{
***************
*** 1007,1011 ****
}
else
! AxisMessageBox(locale->String(IDS_MAPSEDIT_NOAREA), MB_OK | MB_ICONEXCLAMATION);
m_bSearching = false;
}
--- 1007,1011 ----
}
else
! AfxMessageBox(locale->String(IDS_MAPSEDIT_NOAREA), MB_OK | MB_ICONEXCLAMATION);
m_bSearching = false;
}
***************
*** 1078,1082 ****
}
else
! AxisMessageBox(locale->String(IDS_MAPSEDIT_NOROOM), MB_OK | MB_ICONEXCLAMATION);
m_bSearching = false;
}
--- 1078,1082 ----
}
else
! AfxMessageBox(locale->String(IDS_MAPSEDIT_NOROOM), MB_OK | MB_ICONEXCLAMATION);
m_bSearching = false;
}
Index: MapScriptEditDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/MapScriptEditDlg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MapScriptEditDlg.h 2 Jul 2003 13:54:17 -0000 1.2
--- MapScriptEditDlg.h 2 Jul 2003 17:20:08 -0000 1.3
***************
*** 22,28 ****
*/
- //{{AFX_INCLUDES()
- #include "uomap.h"
- //}}AFX_INCLUDES
#if !defined(AFX_MAPSCRIPTEDITDLG_H__98315981_0270_11D3_8716_00805FD91B8C__INCLUDED_)
#define AFX_MAPSCRIPTEDITDLG_H__98315981_0270_11D3_8716_00805FD91B8C__INCLUDED_
--- 22,25 ----
***************
*** 34,37 ****
--- 31,35 ----
#include <afxwin.h>
#include <afxcmn.h>
+ #include "uomap.h"
#include <string>
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ScriptsMain.cpp 1 Jul 2003 14:17:40 -0000 1.21
--- ScriptsMain.cpp 2 Jul 2003 17:20:08 -0000 1.22
***************
*** 2914,2917 ****
--- 2914,2919 ----
void CScriptsMain::RegionEditor(ULONG index)
{
+ CMapScriptEditDlg dlg;
+ dlg.DoModal();
}
Index: ScriptsMain.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** ScriptsMain.h 1 Jul 2003 14:17:40 -0000 1.12
--- ScriptsMain.h 2 Jul 2003 17:20:08 -0000 1.13
***************
*** 7,10 ****
--- 7,11 ----
#include "FileReadProgress.h"
+ #include "MapScriptEditDlg.h"
#include <vector>
Index: strings.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/strings.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** strings.h 1 Jul 2003 14:17:40 -0000 1.4
--- strings.h 2 Jul 2003 17:20:08 -0000 1.5
***************
*** 59,62 ****
--- 59,70 ----
#define IDS_ADDVAL_NAME 241
#define IDS_ADDVAL_FILE 242
+ #define IDS_SCRIPTEDIT_DESCRIPTION 460
+ #define IDS_GENERIC_VALUE 461
+ #define IDS_MAPSEDIT_BLANK 255
+ #define IDS_MAPSEDIT_CANTDELETE 256
+ #define IDS_MAPSEDIT_CHOOSEVERSION 257
+ #define IDS_MAPSEDIT_WARNCANCEL 258
+ #define IDS_MAPSEDIT_NOAREA 259
+ #define IDS_MAPSEDIT_NOROOM 260
|
