[Sphere-axis-commits] CVS: Axis/S_Sphere52 itemeditdlg.cpp,1.3,1.4 npceditdlg.cpp,1.4,1.5 npceditdlg
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis/S_Sphere52 itemeditdlg.cpp,1.3,1.4 npceditdlg.cpp,1.4,1.5 npceditdlg.h,1.2,1.3 Resource.h,1.9,1.10 S_Sphere52.rc,1.12,1.13
|
From: Philip E. <pes...@us...> - 2003-07-17 22:09:09
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv6936/S_Sphere52
Modified Files:
itemeditdlg.cpp npceditdlg.cpp npceditdlg.h Resource.h
S_Sphere52.rc
Log Message:
no message
Index: itemeditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/itemeditdlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemeditdlg.cpp 10 Jul 2003 21:49:36 -0000 1.3
--- itemeditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.4
***************
*** 241,244 ****
--- 241,252 ----
}
+ m_Display.SetMulPath(Main->m_pScripts->MulPath());
+ for ( ULONG i = Map0; i < MulCount; i++ )
+ {
+ CString s = Main->m_pScripts->MulFile(i);
+ if ( s != _T("") )
+ m_Display.SetCustomMulFile((short) i, s);
+ }
+
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
Index: npceditdlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** npceditdlg.cpp 11 Jul 2003 17:25:25 -0000 1.4
--- npceditdlg.cpp 17 Jul 2003 22:09:06 -0000 1.5
***************
*** 117,121 ****
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CNPCEditDlg)
! DDX_Control(pDX, IDC_NPCIMAGE, m_csDisplay);
DDX_Control(pDX, IDC_NPCNOINDEX, m_cbNoIndex);
DDX_Control(pDX, IDC_NPCDISABLEDISPLAY, m_cbDisableDisplay);
--- 117,121 ----
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CNPCEditDlg)
! DDX_Control(pDX, IDC_NPCIMAGE, m_Display);
DDX_Control(pDX, IDC_NPCNOINDEX, m_cbNoIndex);
DDX_Control(pDX, IDC_NPCDISABLEDISPLAY, m_cbDisableDisplay);
***************
*** 261,264 ****
--- 261,273 ----
if ( this->m_bNewMode )
this->OnNewnpc();
+
+ m_Display.SetMulPath(Main->m_pScripts->MulPath());
+ for ( ULONG i = Map0; i < MulCount; i++ )
+ {
+ CString s = Main->m_pScripts->MulFile(i);
+ if ( s != _T("") )
+ m_Display.SetCustomMulFile((short) i, s);
+ }
+
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
***************
*** 2030,2034 ****
void CNPCEditDlg::DrawNPC()
{
- // We really should be using the UOArt control here
}
--- 2039,2042 ----
***************
*** 2114,2118 ****
{
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
! locale->LocalizeWindow(IDD, IDC_NPCIMAGE, (CWnd*)&m_csDisplay, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCNOINDEX, (CWnd*)&m_cbNoIndex, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCDISABLEDISPLAY, (CWnd*)&m_cbDisableDisplay, (CWnd*)this);
--- 2122,2126 ----
{
locale->LocalizeWindow(IDD, 0, NULL, (CWnd*)this);
! locale->LocalizeWindow(IDD, IDC_NPCIMAGE, (CWnd*)&m_Display, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCNOINDEX, (CWnd*)&m_cbNoIndex, (CWnd*)this);
locale->LocalizeWindow(IDD, IDC_NPCDISABLEDISPLAY, (CWnd*)&m_cbDisableDisplay, (CWnd*)this);
Index: npceditdlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/npceditdlg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** npceditdlg.h 9 Jul 2003 19:57:25 -0000 1.2
--- npceditdlg.h 17 Jul 2003 22:09:06 -0000 1.3
***************
*** 32,35 ****
--- 32,36 ----
#include "CategoryTree.h"
+ #include "uoart.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 50,54 ****
//{{AFX_DATA(CNPCEditDlg)
enum { IDD = IDD_NPCEDIT_DLG };
! CStatic m_csDisplay;
CButton m_cbNoIndex;
CButton m_cbDisableDisplay;
--- 51,55 ----
//{{AFX_DATA(CNPCEditDlg)
enum { IDD = IDD_NPCEDIT_DLG };
! CUOArt m_Display;
CButton m_cbNoIndex;
CButton m_cbDisableDisplay;
Index: Resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Resource.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Resource.h 10 Jul 2003 21:49:36 -0000 1.9
--- Resource.h 17 Jul 2003 22:09:06 -0000 1.10
***************
*** 76,79 ****
--- 76,80 ----
#define IDC_PROFILE_DISCARD 232
#define IDC_UOMAPCTRL1 232
+ #define IDC_UOARTCTRL1 234
#define IDI_UPARROW 237
#define IDI_DOWNARROW 238
***************
*** 686,692 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 205
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 234
#define _APS_NEXT_SYMED_VALUE 104
#endif
--- 687,693 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 235
#define _APS_NEXT_SYMED_VALUE 104
#endif
Index: S_Sphere52.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.rc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** S_Sphere52.rc 11 Jul 2003 17:25:25 -0000 1.12
--- S_Sphere52.rc 17 Jul 2003 22:09:06 -0000 1.13
***************
*** 362,367 ****
LTEXT "Subsection",IDC_NE_STATIC18,304,167,36,8
LTEXT "Description",IDC_NE_STATIC19,304,182,36,8
! CONTROL "",IDC_NPCIMAGE,"Static",SS_BITMAP | SS_CENTERIMAGE,300,
! 27,124,110
END
--- 362,367 ----
LTEXT "Subsection",IDC_NE_STATIC18,304,167,36,8
LTEXT "Description",IDC_NE_STATIC19,304,182,36,8
! CONTROL "",IDC_NPCIMAGE,"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",
! WS_TABSTOP,300,27,135,110
END
***************
*** 1499,1502 ****
--- 1499,1510 ----
0x0000, 0x0000, 0x0000, 0x0001, 0x2aca, 0x0000, 0x2a60, 0x0000, 0x0000,
0x0000, 0x0001, 0x000c, 0x0008, 0x0000, "\000"
+ 0
+ END
+
+ IDD_NPCEDIT_DLG DLGINIT
+ BEGIN
+ IDC_NPCIMAGE, 0x376, 28, 0
+ 0x0000, 0x0000, 0x0000, 0x0001, 0x14fb, 0x0000, 0x1280, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0
END
|
