Skip to content

Commit d1e50fb

Browse files
committed
LevelEditor: fixed includes and formatted code
1 parent b6efabb commit d1e50fb

File tree

185 files changed

+27929
-21797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+27929
-21797
lines changed

src/editors/LevelEditor/BottomBar.cpp

Lines changed: 266 additions & 202 deletions
Large diffs are not rendered by default.

src/editors/LevelEditor/DOOneColor.cpp

Lines changed: 58 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,109 +3,125 @@
33

44
#include "DOOneColor.h"
55
#include "DOShuffle.h"
6-
#include "../ECore/Editor/ColorPicker.h"
6+
#include "editors/ECore/Editor/ColorPicker.h"
77
//---------------------------------------------------------------------------
88
#pragma package(smart_init)
99
#pragma link "ElXPThemedControl"
1010
#pragma link "ExtBtn"
1111
#pragma resource "*.dfm"
1212
//---------------------------------------------------------------------------
13-
__fastcall TfrmOneColor::TfrmOneColor(TComponent* Owner)
14-
: TForm(Owner)
15-
{
16-
}
13+
__fastcall TfrmOneColor::TfrmOneColor(TComponent *Owner)
14+
: TForm(Owner) {}
15+
1716
//---------------------------------------------------------------------------
1817

19-
void __fastcall TfrmOneColor::ShowIndex(TfrmDOShuffle* parent)
18+
void __fastcall TfrmOneColor::ShowIndex(TfrmDOShuffle *parent)
2019
{
21-
m_Parent = parent;
22-
// VERIFY(stage);
23-
// m_CurStage = stage;
20+
m_Parent = parent;
21+
// VERIFY(stage);
22+
// m_CurStage = stage;
2423

2524
bLoadMode = true;
26-
// if (m_CurStage){
27-
// }
25+
// if (m_CurStage){
26+
// }
2827
bLoadMode = false;
29-
Visible=true;
28+
Visible = true;
3029
}
30+
3131
//---------------------------------------------------------------------------
3232

33-
void __fastcall TfrmOneColor::HideIndex(){
34-
Visible=false;
33+
void __fastcall TfrmOneColor::HideIndex()
34+
{
35+
Visible = false;
3536
}
37+
3638
//---------------------------------------------------------------------------
3739

3840
void __fastcall TfrmOneColor::mcColorMouseDown(TObject *Sender,
39-
TMouseButton Button, TShiftState Shift, int X, int Y)
41+
TMouseButton Button, TShiftState Shift, int X, int Y)
4042
{
41-
u32 color = ((TMultiObjColor*)Sender)->Brush->Color;
42-
if (SelectColorWin(&color)){
43-
((TMultiObjColor*)Sender)->_Set(color);
44-
m_Parent->bColorIndModif = true;
43+
u32 color = ((TMultiObjColor*)Sender)->Brush->Color;
44+
if (SelectColorWin(&color))
45+
{
46+
((TMultiObjColor*)Sender)->_Set(color);
47+
m_Parent->bColorIndModif = true;
4548
}
4649
}
50+
4751
//---------------------------------------------------------------------------
4852

4953
void __fastcall TfrmOneColor::FormClose(TObject *Sender,
50-
TCloseAction &Action)
54+
TCloseAction &Action)
5155
{
52-
Action = caFree;
56+
Action = caFree;
5357
m_Parent->RemoveColorIndex(this);
5458
}
59+
5560
//---------------------------------------------------------------------------
5661

5762
void __fastcall TfrmOneColor::ebMultiRemoveClick(TObject *Sender)
5863
{
59-
Close();
64+
Close();
6065
}
66+
6167
//---------------------------------------------------------------------------
6268

6369
void __fastcall TfrmOneColor::tvDOListDragOver(TObject *Sender,
64-
TObject *Source, int X, int Y, TDragState State, bool &Accept)
70+
TObject *Source, int X, int Y, TDragState State, bool &Accept)
6571
{
6672
Accept = false;
67-
if (Source == tvDOList) return;
68-
if (Source != m_Parent->tvItems) return;
69-
for ( TElTreeItem* node = tvDOList->Items->GetFirstNode(); node; node = node->GetNext())
70-
if (node->Text == m_Parent->FDragItem->Text) return;
71-
Accept = true;
73+
if (Source==tvDOList)
74+
return;
75+
if (Source!=m_Parent->tvItems)
76+
return;
77+
for (TElTreeItem *node = tvDOList->Items->GetFirstNode(); node; node = node->GetNext())
78+
if (node->Text==m_Parent->FDragItem->Text)
79+
return;
80+
Accept = true;
7281
}
82+
7383
//---------------------------------------------------------------------------
7484

7585
void __fastcall TfrmOneColor::tvDOListDragDrop(TObject *Sender,
76-
TObject *Source, int X, int Y)
86+
TObject *Source, int X, int Y)
7787
{
78-
tvDOList->Items->AddObject(0,m_Parent->FDragItem->Text,m_Parent->FDragItem->Data);
79-
m_Parent->bColorIndModif = true;
88+
tvDOList->Items->AddObject(0, m_Parent->FDragItem->Text, m_Parent->FDragItem->Data);
89+
m_Parent->bColorIndModif = true;
8090
}
91+
8192
//---------------------------------------------------------------------------
8293

8394
void __fastcall TfrmOneColor::tvDOListStartDrag(TObject *Sender,
84-
TDragObject *&DragObject)
95+
TDragObject *&DragObject)
8596
{
86-
FDragItem = tvDOList->ItemFocused;
97+
FDragItem = tvDOList->ItemFocused;
8798
}
99+
88100
//---------------------------------------------------------------------------
89101

90-
void __fastcall TfrmOneColor::RemoveObject(LPCSTR text){
91-
for ( TElTreeItem* node = tvDOList->Items->GetFirstNode(); node; node = node->GetNext())
92-
if (node->Text == (WideString)text){
93-
node->Delete();
94-
return;
102+
void __fastcall TfrmOneColor::RemoveObject(LPCSTR text)
103+
{
104+
for (TElTreeItem *node = tvDOList->Items->GetFirstNode(); node; node = node->GetNext())
105+
if (node->Text==(WideString)text)
106+
{
107+
node->Delete();
108+
return;
95109
}
96110
}
97111

98112
void __fastcall TfrmOneColor::AppendObject(LPCSTR text, LPVOID data)
99113
{
100-
for ( TElTreeItem* node = tvDOList->Items->GetFirstNode(); node; node = node->GetNext())
101-
if (node->Text == (WideString)text) return;
102-
tvDOList->Items->AddObject(0,text,data);
114+
for (TElTreeItem *node = tvDOList->Items->GetFirstNode(); node; node = node->GetNext())
115+
if (node->Text==(WideString)text)
116+
return;
117+
tvDOList->Items->AddObject(0, text, data);
103118
}
104119

105120
void __fastcall TfrmOneColor::tvDOListItemFocused(TObject *Sender)
106121
{
107-
m_Parent->OnItemFocused (tvDOList);
122+
m_Parent->OnItemFocused(tvDOList);
108123
}
124+
109125
//---------------------------------------------------------------------------
110126

111127

0 commit comments

Comments
 (0)