Skip to content

Commit 34eb4fa

Browse files
committed
Use classes instead of structs for editor trackers
1 parent 2ca8008 commit 34eb4fa

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

src/game/editor/editor_trackers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,12 +434,12 @@ void CSoundSourceOperationTracker::End()
434434

435435
// -----------------------------------------------------------------------
436436

437-
int SPropTrackerHelper::GetDefaultGroupIndex(CEditorMap *pMap)
437+
int CPropTrackerHelper::GetDefaultGroupIndex(CEditorMap *pMap)
438438
{
439439
return pMap->m_SelectedGroup;
440440
}
441441

442-
int SPropTrackerHelper::GetDefaultLayerIndex(CEditorMap *pMap)
442+
int CPropTrackerHelper::GetDefaultLayerIndex(CEditorMap *pMap)
443443
{
444444
return pMap->m_vSelectedLayers[0];
445445
}

src/game/editor/editor_trackers.h

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,15 @@ class CEnvelopeEditorOperationTracker : public CMapObject
8585
private:
8686
EEnvelopeEditorOp m_TrackedOp = EEnvelopeEditorOp::OP_NONE;
8787

88-
struct SPointData
88+
class CPointData
8989
{
90+
public:
9091
bool m_Used;
9192
CFixedTime m_Time;
9293
std::map<int, int> m_Values;
9394
};
9495

95-
std::map<int, SPointData> m_SavedValues;
96+
std::map<int, CPointData> m_SavedValues;
9697

9798
void HandlePointDragStart();
9899
void HandlePointDragEnd(bool Switch);
@@ -111,15 +112,17 @@ class CSoundSourceOperationTracker : public CMapObject
111112
ESoundSourceOp m_TrackedOp;
112113
int m_LayerIndex;
113114

114-
struct SData
115+
class CData
115116
{
117+
public:
116118
CPoint m_OriginalPoint;
117119
};
118-
SData m_Data;
120+
CData m_Data;
119121
};
120122

121-
struct SPropTrackerHelper
123+
class CPropTrackerHelper
122124
{
125+
public:
123126
static int GetDefaultGroupIndex(CEditorMap *pMap);
124127
static int GetDefaultLayerIndex(CEditorMap *pMap);
125128
};
@@ -144,8 +147,8 @@ class CPropTracker : public CMapObject
144147
return;
145148
m_pObject = pObject;
146149

147-
m_OriginalGroupIndex = GroupIndex < 0 ? SPropTrackerHelper::GetDefaultGroupIndex(Map()) : GroupIndex;
148-
m_OriginalLayerIndex = LayerIndex < 0 ? SPropTrackerHelper::GetDefaultLayerIndex(Map()) : LayerIndex;
150+
m_OriginalGroupIndex = GroupIndex < 0 ? CPropTrackerHelper::GetDefaultGroupIndex(Map()) : GroupIndex;
151+
m_OriginalLayerIndex = LayerIndex < 0 ? CPropTrackerHelper::GetDefaultLayerIndex(Map()) : LayerIndex;
149152
m_CurrentGroupIndex = m_OriginalGroupIndex;
150153
m_CurrentLayerIndex = m_OriginalLayerIndex;
151154

@@ -163,8 +166,8 @@ class CPropTracker : public CMapObject
163166
if(!m_Tracking || Prop == static_cast<E>(-1))
164167
return;
165168

166-
m_CurrentGroupIndex = GroupIndex < 0 ? SPropTrackerHelper::GetDefaultGroupIndex(Map()) : GroupIndex;
167-
m_CurrentLayerIndex = LayerIndex < 0 ? SPropTrackerHelper::GetDefaultLayerIndex(Map()) : LayerIndex;
169+
m_CurrentGroupIndex = GroupIndex < 0 ? CPropTrackerHelper::GetDefaultGroupIndex(Map()) : GroupIndex;
170+
m_CurrentLayerIndex = LayerIndex < 0 ? CPropTrackerHelper::GetDefaultLayerIndex(Map()) : LayerIndex;
168171

169172
if(State == EEditState::END || State == EEditState::ONE_GO)
170173
{

0 commit comments

Comments
 (0)