This commit is contained in:
Daveo 2001-04-09 14:56:05 +00:00
parent d490a19952
commit 2e606b05d2
19 changed files with 79 additions and 31 deletions

View file

@ -32,6 +32,10 @@ void CGUILayerActor::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGUILayerActor) //{{AFX_DATA_MAP(CGUILayerActor)
DDX_Control(pDX, IDC_ACTOR_TURNRATE_SPIN, m_TurnRateSpin);
DDX_Control(pDX, IDC_ACTOR_SPEED_SPIN, m_SpeedSpin);
DDX_Control(pDX, IDC_ACTOR_HEALTH_SPIN, m_HealthSpin);
DDX_Control(pDX, IDC_ACTOR_ATTACK_SPIN, m_AttackSpin);
DDX_Control(pDX, IDC_ACTOR_COLLISION, m_Collision); DDX_Control(pDX, IDC_ACTOR_COLLISION, m_Collision);
DDX_Control(pDX, IDC_ACTOR_PLAYER, m_Player); DDX_Control(pDX, IDC_ACTOR_PLAYER, m_Player);
DDX_Control(pDX, IDC_ACTOR_TURNRATE, m_TurnRate); DDX_Control(pDX, IDC_ACTOR_TURNRATE, m_TurnRate);

View file

@ -19,6 +19,10 @@ public:
// Dialog Data // Dialog Data
//{{AFX_DATA(CGUILayerActor) //{{AFX_DATA(CGUILayerActor)
enum { IDD = IDD_LAYER_ACTOR }; enum { IDD = IDD_LAYER_ACTOR };
CSpinButtonCtrl m_TurnRateSpin;
CSpinButtonCtrl m_SpeedSpin;
CSpinButtonCtrl m_HealthSpin;
CSpinButtonCtrl m_AttackSpin;
CButton m_Collision; CButton m_Collision;
CButton m_Player; CButton m_Player;
CEdit m_TurnRate; CEdit m_TurnRate;

View file

@ -32,6 +32,9 @@ void CGUILayerFX::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGUILayerFX) //{{AFX_DATA_MAP(CGUILayerFX)
DDX_Control(pDX, IDC_FX_HEIGHT_SPIN, m_HeightSpin);
DDX_Control(pDX, IDC_FX_SPEED_SPIN, m_SpeedSpin);
DDX_Control(pDX, IDC_FX_WIDTH_SPIN, m_WidthSpin);
DDX_Control(pDX, IDC_FX_WIDTH, m_Width); DDX_Control(pDX, IDC_FX_WIDTH, m_Width);
DDX_Control(pDX, IDC_FX_HEIGHT, m_Height); DDX_Control(pDX, IDC_FX_HEIGHT, m_Height);
DDX_Control(pDX, IDC_FX_SPEED, m_Speed); DDX_Control(pDX, IDC_FX_SPEED, m_Speed);

View file

@ -19,6 +19,9 @@ public:
// Dialog Data // Dialog Data
//{{AFX_DATA(CGUILayerFX) //{{AFX_DATA(CGUILayerFX)
enum { IDD = IDD_LAYER_FX }; enum { IDD = IDD_LAYER_FX };
CSpinButtonCtrl m_HeightSpin;
CSpinButtonCtrl m_SpeedSpin;
CSpinButtonCtrl m_WidthSpin;
CEdit m_Width; CEdit m_Width;
CEdit m_Height; CEdit m_Height;
CEdit m_Speed; CEdit m_Speed;

View file

@ -32,6 +32,8 @@ void CGUILayerPlatform::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGUILayerPlatform) //{{AFX_DATA_MAP(CGUILayerPlatform)
DDX_Control(pDX, IDC_PLATFORM_TURNRATE_SPIN, m_TurnRateSpin);
DDX_Control(pDX, IDC_PLATFORM_SPEED_SPIN, m_SpeedSpin);
DDX_Control(pDX, IDC_PLATFORM_TYPE, m_Type); DDX_Control(pDX, IDC_PLATFORM_TYPE, m_Type);
DDX_Control(pDX, IDC_PLATFORM_MOVE_TYPE, m_MoveList); DDX_Control(pDX, IDC_PLATFORM_MOVE_TYPE, m_MoveList);
DDX_Control(pDX, IDC_PLATFORM_COLLISION, m_Collision); DDX_Control(pDX, IDC_PLATFORM_COLLISION, m_Collision);

View file

@ -19,6 +19,8 @@ public:
// Dialog Data // Dialog Data
//{{AFX_DATA(CGUILayerPlatform) //{{AFX_DATA(CGUILayerPlatform)
enum { IDD = IDD_LAYER_PLATFORM }; enum { IDD = IDD_LAYER_PLATFORM };
CSpinButtonCtrl m_TurnRateSpin;
CSpinButtonCtrl m_SpeedSpin;
CComboBox m_Type; CComboBox m_Type;
CComboBox m_MoveList; CComboBox m_MoveList;
CButton m_Collision; CButton m_Collision;

View file

@ -36,6 +36,7 @@ void CGUILayerShade::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGUILayerShade) //{{AFX_DATA_MAP(CGUILayerShade)
DDX_Control(pDX, IDC_SPIN2, m_CountSpin);
DDX_Control(pDX, IDC_LAYERSHADE_SPIN1, m_Spin1); DDX_Control(pDX, IDC_LAYERSHADE_SPIN1, m_Spin1);
DDX_Control(pDX, IDC_LAYERSHADE_SPIN0, m_Spin0); DDX_Control(pDX, IDC_LAYERSHADE_SPIN0, m_Spin0);
DDX_Control(pDX, IDC_LAYERSHADE_SCALE1, m_Scale1); DDX_Control(pDX, IDC_LAYERSHADE_SCALE1, m_Scale1);

View file

@ -34,6 +34,7 @@ public:
// Dialog Data // Dialog Data
//{{AFX_DATA(CGUILayerShade) //{{AFX_DATA(CGUILayerShade)
enum { IDD = IDD_LAYER_SHADE }; enum { IDD = IDD_LAYER_SHADE };
CSpinButtonCtrl m_CountSpin;
CButton m_Spin1; CButton m_Spin1;
CButton m_Spin0; CButton m_Spin0;
CButton m_Scale1; CButton m_Scale1;

View file

@ -32,6 +32,8 @@ void CGUILayerTrigger::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGUILayerTrigger) //{{AFX_DATA_MAP(CGUILayerTrigger)
DDX_Control(pDX, IDC_TRIGGER_WIDTH_SPIN, m_WidthSpin);
DDX_Control(pDX, IDC_TRIGGER_HEIGHT_SPIN, m_HeightSpin);
DDX_Control(pDX, IDC_TRIGGER_WIDTH, m_Width); DDX_Control(pDX, IDC_TRIGGER_WIDTH, m_Width);
DDX_Control(pDX, IDC_TRIGGER_HEIGHT, m_Height); DDX_Control(pDX, IDC_TRIGGER_HEIGHT, m_Height);
//}}AFX_DATA_MAP //}}AFX_DATA_MAP

View file

@ -19,6 +19,8 @@ public:
// Dialog Data // Dialog Data
//{{AFX_DATA(CGUILayerTrigger) //{{AFX_DATA(CGUILayerTrigger)
enum { IDD = IDD_LAYER_TRIGGER }; enum { IDD = IDD_LAYER_TRIGGER };
CSpinButtonCtrl m_WidthSpin;
CSpinButtonCtrl m_HeightSpin;
CEdit m_Width; CEdit m_Width;
CEdit m_Height; CEdit m_Height;
//}}AFX_DATA //}}AFX_DATA

View file

@ -50,6 +50,12 @@ void CLayerActor::GUIInit(CCore *Core)
Core->GUIAdd(GUIThingPos,IDD_LAYER_THING_POS); Core->GUIAdd(GUIThingPos,IDD_LAYER_THING_POS);
Core->GUIAdd(GUIActor,IDD_LAYER_ACTOR); Core->GUIAdd(GUIActor,IDD_LAYER_ACTOR);
GUIActor.DisableCallback(false); GUIActor.DisableCallback(false);
GUIActor.m_HealthSpin.SetRange(0,255);
GUIActor.m_AttackSpin.SetRange(0,255);
GUIActor.m_SpeedSpin.SetRange(0,255);
GUIActor.m_TurnRateSpin.SetRange(0,255);
} }
/*****************************************************************************/ /*****************************************************************************/

View file

@ -113,6 +113,11 @@ void CLayerFX::GUIInit(CCore *Core)
Core->GUIAdd(GUIThing,IDD_LAYER_THING); Core->GUIAdd(GUIThing,IDD_LAYER_THING);
Core->GUIAdd(GUIFX,IDD_LAYER_FX); Core->GUIAdd(GUIFX,IDD_LAYER_FX);
GUIFX.DisableCallback(false); GUIFX.DisableCallback(false);
GUIFX.m_WidthSpin.SetRange(1,255);
GUIFX.m_HeightSpin.SetRange(1,255);
GUIFX.m_SpeedSpin.SetRange(0,255);
} }
/*****************************************************************************/ /*****************************************************************************/

View file

@ -51,6 +51,9 @@ void CLayerPlatform::GUIInit(CCore *Core)
Core->GUIAdd(GUIPlatform,IDD_LAYER_PLATFORM); Core->GUIAdd(GUIPlatform,IDD_LAYER_PLATFORM);
GUIPlatform.DisableCallback(false); GUIPlatform.DisableCallback(false);
GUIPlatform.m_SpeedSpin.SetRange(0,255);
GUIPlatform.m_TurnRateSpin.SetRange(0,255);
// Init type lists // Init type lists
{ {
CComboBox &List=GUIPlatform.m_MoveList; CComboBox &List=GUIPlatform.m_MoveList;

View file

@ -214,6 +214,9 @@ void CLayerShade::GUIInit(CCore *Core)
GUI.m_Trans1.AddString("Another one"); GUI.m_Trans1.AddString("Another one");
GUI.m_Trans1.SetCurSel(TransMode1); GUI.m_Trans1.SetCurSel(TransMode1);
GUI.m_CountSpin.SetRange(1,4);
} }
/*****************************************************************************/ /*****************************************************************************/

View file

@ -113,6 +113,9 @@ void CLayerTrigger::GUIInit(CCore *Core)
Core->GUIAdd(GUIThing,IDD_LAYER_THING); Core->GUIAdd(GUIThing,IDD_LAYER_THING);
Core->GUIAdd(GUITrigger,IDD_LAYER_TRIGGER); Core->GUIAdd(GUITrigger,IDD_LAYER_TRIGGER);
GUITrigger.DisableCallback(false); GUITrigger.DisableCallback(false);
GUITrigger.m_WidthSpin.SetRange(1,255);
GUITrigger.m_HeightSpin.SetRange(1,255);
} }
/*****************************************************************************/ /*****************************************************************************/

View file

@ -2,7 +2,7 @@
[General Info] [General Info]
Version=1 Version=1
LastClass=CGUILayerShade LastClass=CGUILayerTrigger
LastTemplate=CDialog LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h" NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "mapedit.h" NewFileInclude2=#include "mapedit.h"
@ -33,26 +33,26 @@ Class21=CMapEditDoc
Class22=CMapEditView Class22=CMapEditView
ResourceCount=20 ResourceCount=20
Resource1=IDD_RESIZE Resource1=IDD_ADDLAYER
Resource2=IDD_NEWMAP Resource2=IDD_LAYER_PLATFORM
Resource3=IDD_TOOLBAR Resource3=IDR_TOOLBAR (English (U.S.))
Resource4=IDR_MAPEDITYPE (English (U.S.)) Resource4=IDR_MAPEDITYPE (English (U.S.))
Resource5=IDD_LAYER_THING_POS Resource5=IDD_NEWMAP
Resource6=IDD_LAYER_SHADE Resource6=IDD_TOOLBAR
Resource7=IDD_LAYER_ACTOR Resource7=IDD_LAYER_LIST
Resource8=IDD_LAYER_LIST Resource8=IDD_LAYER_ACTOR
Resource9=IDD_MULTIBAR (English (U.S.)) Resource9=IDD_ELEMLIST
Resource10=IDD_LAYER_THING Resource10=IDD_RESIZE
Resource11=IDD_LAYER_TRIGGER Resource11=IDD_TILEBANK
Resource12=IDD_ADDLAYER Resource12=IDD_LAYER_THING_POS
Resource13=IDD_TILEBANK Resource13=IDD_LAYER_TRIGGER
Resource14=IDR_MAINFRAME (English (U.S.)) Resource14=IDD_LAYER_SHADE
Resource15=IDD_ABOUTBOX (English (U.S.)) Resource15=IDD_LAYER_COLLISION
Resource16=IDD_LAYER_COLLISION Resource16=IDD_ABOUTBOX (English (U.S.))
Resource17=IDD_ELEMLIST Resource17=IDD_MULTIBAR (English (U.S.))
Resource18=IDR_TOOLBAR (English (U.S.)) Resource18=IDR_MAINFRAME (English (U.S.))
Class23=CGUILayerTrigger Class23=CGUILayerTrigger
Resource19=IDD_LAYER_PLATFORM Resource19=IDD_LAYER_THING
Class24=CGUILayerFX Class24=CGUILayerFX
Resource20=IDD_LAYER_FX Resource20=IDD_LAYER_FX
@ -85,6 +85,9 @@ Type=0
BaseClass=CDialog BaseClass=CDialog
HeaderFile=GUILayerActor.h HeaderFile=GUILayerActor.h
ImplementationFile=GUILayerActor.cpp ImplementationFile=GUILayerActor.cpp
Filter=D
VirtualFilter=dWC
LastObject=IDC_ACTOR_SPEED_SPIN
[CLS:GUILayerCollision] [CLS:GUILayerCollision]
Type=0 Type=0
@ -472,7 +475,7 @@ Control1=IDC_TRIGGER_SIZE,static,1342308354
Control2=IDC_TRIGGER_WIDTH,edit,1350633600 Control2=IDC_TRIGGER_WIDTH,edit,1350633600
Control3=IDC_TRIGGER_WIDTH_SPIN,msctls_updown32,1342177334 Control3=IDC_TRIGGER_WIDTH_SPIN,msctls_updown32,1342177334
Control4=IDC_TRIGGER_HEIGHT,edit,1350633600 Control4=IDC_TRIGGER_HEIGHT,edit,1350633600
Control5=IDC_PLATFORM_TURNRATE_SPIN,msctls_updown32,1342177334 Control5=IDC_TRIGGER_HEIGHT_SPIN,msctls_updown32,1342177334
[CLS:CGUILayerTrigger] [CLS:CGUILayerTrigger]
Type=0 Type=0
@ -492,7 +495,7 @@ Control2=IDC_FX_SIZE_TEXT,static,1342308354
Control3=IDC_FX_WIDTH,edit,1350633600 Control3=IDC_FX_WIDTH,edit,1350633600
Control4=IDC_FX_WIDTH_SPIN,msctls_updown32,1342177334 Control4=IDC_FX_WIDTH_SPIN,msctls_updown32,1342177334
Control5=IDC_FX_HEIGHT,edit,1350633600 Control5=IDC_FX_HEIGHT,edit,1350633600
Control6=IDC_FX_TURNRATE_SPIN,msctls_updown32,1342177334 Control6=IDC_FX_HEIGHT_SPIN,msctls_updown32,1342177334
Control7=IDC_FX_SPEED,edit,1350633600 Control7=IDC_FX_SPEED,edit,1350633600
Control8=IDC_FX_SPEED_SPIN,msctls_updown32,1342177462 Control8=IDC_FX_SPEED_SPIN,msctls_updown32,1342177462

View file

@ -502,14 +502,14 @@ BEGIN
ES_NUMBER ES_NUMBER
END END
IDD_ADDLAYER DIALOGEX 0, 0, 118, 90 IDD_ADDLAYER DIALOGEX 0, 0, 118, 130
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Select Layer To Add." CAPTION "Select Layer To Add."
FONT 8, "MS Sans Serif", 0, 0, 0x1 FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,60,75,50,14 DEFPUSHBUTTON "OK",IDOK,60,110,50,14
PUSHBUTTON "Cancel",IDCANCEL,5,75,50,14 PUSHBUTTON "Cancel",IDCANCEL,5,110,50,14
LISTBOX IDC_ADDLAYER_LIST,5,5,105,65,LBS_NOINTEGRALHEIGHT | LISTBOX IDC_ADDLAYER_LIST,5,5,105,100,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME WS_VSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME
END END
@ -704,7 +704,7 @@ BEGIN
UDS_ARROWKEYS,90,5,11,10 UDS_ARROWKEYS,90,5,11,10
EDITTEXT IDC_TRIGGER_HEIGHT,50,5,25,12,ES_AUTOHSCROLL | EDITTEXT IDC_TRIGGER_HEIGHT,50,5,25,12,ES_AUTOHSCROLL |
ES_READONLY ES_READONLY
CONTROL "Spin1",IDC_PLATFORM_TURNRATE_SPIN,"msctls_updown32", CONTROL "Spin1",IDC_TRIGGER_HEIGHT_SPIN,"msctls_updown32",
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS,100,5,11,10 UDS_ARROWKEYS,100,5,11,10
END END
@ -720,7 +720,7 @@ BEGIN
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS,90,5,11,10 UDS_ARROWKEYS,90,5,11,10
EDITTEXT IDC_FX_HEIGHT,50,5,25,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_FX_HEIGHT,50,5,25,12,ES_AUTOHSCROLL | ES_READONLY
CONTROL "Spin1",IDC_FX_TURNRATE_SPIN,"msctls_updown32", CONTROL "Spin1",IDC_FX_HEIGHT_SPIN,"msctls_updown32",
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS,100,5,11,10 UDS_ARROWKEYS,100,5,11,10
EDITTEXT IDC_FX_SPEED,25,25,24,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_FX_SPEED,25,25,24,12,ES_AUTOHSCROLL | ES_READONLY
@ -767,7 +767,7 @@ BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 111 RIGHTMARGIN, 111
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 83 BOTTOMMARGIN, 123
END END
IDD_TILEBANK, DIALOG IDD_TILEBANK, DIALOG

View file

@ -104,7 +104,7 @@
#define IDC_FX_WIDTH 1147 #define IDC_FX_WIDTH 1147
#define IDC_FX_HEIGHT 1148 #define IDC_FX_HEIGHT 1148
#define IDC_FX_WIDTH_SPIN 1149 #define IDC_FX_WIDTH_SPIN 1149
#define IDC_FX_TURNRATE_SPIN 1150 #define IDC_FX_HEIGHT_SPIN 1150
#define IDC_FX_SPEED 1151 #define IDC_FX_SPEED 1151
#define IDC_FX_SPEED_SPIN 1152 #define IDC_FX_SPEED_SPIN 1152
#define IDC_LAYERSHADE_BACKGFX0 1153 #define IDC_LAYERSHADE_BACKGFX0 1153
@ -118,6 +118,7 @@
#define IDC_LAYERSHADE_SCALE1 1161 #define IDC_LAYERSHADE_SCALE1 1161
#define IDC_LAYERSHADE_TRANS0 1162 #define IDC_LAYERSHADE_TRANS0 1162
#define IDC_LAYERSHADE_COLOR1 1163 #define IDC_LAYERSHADE_COLOR1 1163
#define IDC_TRIGGER_HEIGHT_SPIN 1163
#define IDC_LAYERSHADE_TRANS1 1164 #define IDC_LAYERSHADE_TRANS1 1164
#define ID_TOOLBAR_TILEPALETTE 32774 #define ID_TOOLBAR_TILEPALETTE 32774
#define ID_TOOLBAR_PARAMBAR 32783 #define ID_TOOLBAR_PARAMBAR 32783
@ -144,7 +145,7 @@
#define _APS_3D_CONTROLS 1 #define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 180 #define _APS_NEXT_RESOURCE_VALUE 180
#define _APS_NEXT_COMMAND_VALUE 32801 #define _APS_NEXT_COMMAND_VALUE 32801
#define _APS_NEXT_CONTROL_VALUE 1163 #define _APS_NEXT_CONTROL_VALUE 1164
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif

Binary file not shown.