From 3c5320aa906991629b71f6ca4ea60d9b7584544c Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Sat, 27 Jul 2024 22:03:19 +0800 Subject: [PATCH] Rename editor component `Init` to `OnInit` This matches the naming convention used for client components and the `GameServer()->OnInit()` --- src/game/editor/auto_map.cpp | 2 +- src/game/editor/component.cpp | 2 +- src/game/editor/editor.cpp | 6 +++--- src/game/editor/editor_object.cpp | 2 +- src/game/editor/editor_object.h | 2 +- src/game/editor/editor_server_settings.cpp | 4 ++-- src/game/editor/editor_server_settings.h | 2 +- src/game/editor/layer_selector.cpp | 4 ++-- src/game/editor/layer_selector.h | 2 +- src/game/editor/map_view.cpp | 6 +++--- src/game/editor/map_view.h | 2 +- src/game/editor/mapitems/image.cpp | 6 +++--- src/game/editor/mapitems/image.h | 2 +- src/game/editor/mapitems/sound.cpp | 2 +- src/game/editor/proof_mode.cpp | 4 ++-- src/game/editor/proof_mode.h | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/game/editor/auto_map.cpp b/src/game/editor/auto_map.cpp index e1ae00b0a..4edb40238 100644 --- a/src/game/editor/auto_map.cpp +++ b/src/game/editor/auto_map.cpp @@ -42,7 +42,7 @@ static int HashLocation(uint32_t Seed, uint32_t Run, uint32_t Rule, uint32_t X, CAutoMapper::CAutoMapper(CEditor *pEditor) { - Init(pEditor); + OnInit(pEditor); } void CAutoMapper::Load(const char *pTileName) diff --git a/src/game/editor/component.cpp b/src/game/editor/component.cpp index 05e49ad29..f008ab4e4 100644 --- a/src/game/editor/component.cpp +++ b/src/game/editor/component.cpp @@ -14,7 +14,7 @@ void CEditorComponent::InitSubComponents() { for(CEditorComponent &Component : m_vSubComponents) { - Component.Init(Editor()); + Component.OnInit(Editor()); } } diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index a90320217..f04d73f08 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -8324,15 +8324,15 @@ void CEditor::Init() m_PopupEventWasActivated = false; }); m_RenderTools.Init(m_pGraphics, m_pTextRender); - m_ZoomEnvelopeX.Init(this); - m_ZoomEnvelopeY.Init(this); + m_ZoomEnvelopeX.OnInit(this); + m_ZoomEnvelopeY.OnInit(this); m_Map.m_pEditor = this; m_vComponents.emplace_back(m_MapView); m_vComponents.emplace_back(m_MapSettingsBackend); m_vComponents.emplace_back(m_LayerSelector); for(CEditorComponent &Component : m_vComponents) - Component.Init(this); + Component.OnInit(this); m_CheckerTexture = Graphics()->LoadTexture("editor/checker.png", IStorage::TYPE_ALL); m_BackgroundTexture = Graphics()->LoadTexture("editor/background.png", IStorage::TYPE_ALL); diff --git a/src/game/editor/editor_object.cpp b/src/game/editor/editor_object.cpp index 76d29fd79..2889a068f 100644 --- a/src/game/editor/editor_object.cpp +++ b/src/game/editor/editor_object.cpp @@ -2,7 +2,7 @@ #include "editor.h" -void CEditorObject::Init(CEditor *pEditor) +void CEditorObject::OnInit(CEditor *pEditor) { m_pEditor = pEditor; OnReset(); diff --git a/src/game/editor/editor_object.h b/src/game/editor/editor_object.h index 104d1d363..59fee4b2e 100644 --- a/src/game/editor/editor_object.h +++ b/src/game/editor/editor_object.h @@ -28,7 +28,7 @@ public: * Needs to be the first function that is called. * The default implentation also resets the component. */ - virtual void Init(CEditor *pEditor); + virtual void OnInit(CEditor *pEditor); /** * Maybe calls `OnHot` or `OnActive`. diff --git a/src/game/editor/editor_server_settings.cpp b/src/game/editor/editor_server_settings.cpp index b8c374c01..d2bddc2b0 100644 --- a/src/game/editor/editor_server_settings.cpp +++ b/src/game/editor/editor_server_settings.cpp @@ -1049,9 +1049,9 @@ void CEditor::MapSettingsDropdownRenderCallback(const SPossibleValueMatch &Match CMapSettingsBackend::CContext *CMapSettingsBackend::ms_pActiveContext = nullptr; -void CMapSettingsBackend::Init(CEditor *pEditor) +void CMapSettingsBackend::OnInit(CEditor *pEditor) { - CEditorComponent::Init(pEditor); + CEditorComponent::OnInit(pEditor); // Register values loader InitValueLoaders(); diff --git a/src/game/editor/editor_server_settings.h b/src/game/editor/editor_server_settings.h index 6982bb4c7..f4f1d6e29 100644 --- a/src/game/editor/editor_server_settings.h +++ b/src/game/editor/editor_server_settings.h @@ -198,7 +198,7 @@ class CMapSettingsBackend : public CEditorComponent public: // General methods CMapSettingsBackend() = default; - void Init(CEditor *pEditor) override; + void OnInit(CEditor *pEditor) override; bool OnInput(const IInput::CEvent &Event) override; void OnUpdate() override; void OnMapLoad() override; diff --git a/src/game/editor/layer_selector.cpp b/src/game/editor/layer_selector.cpp index 72cde503c..f2e3c810e 100644 --- a/src/game/editor/layer_selector.cpp +++ b/src/game/editor/layer_selector.cpp @@ -2,9 +2,9 @@ #include "layer_selector.h" -void CLayerSelector::Init(CEditor *pEditor) +void CLayerSelector::OnInit(CEditor *pEditor) { - CEditorComponent::Init(pEditor); + CEditorComponent::OnInit(pEditor); m_SelectionOffset = 0; } diff --git a/src/game/editor/layer_selector.h b/src/game/editor/layer_selector.h index 93d6ed97c..1ea088ac2 100644 --- a/src/game/editor/layer_selector.h +++ b/src/game/editor/layer_selector.h @@ -8,7 +8,7 @@ class CLayerSelector : public CEditorComponent int m_SelectionOffset; public: - void Init(CEditor *pEditor) override; + void OnInit(CEditor *pEditor) override; bool SelectByTile(); }; diff --git a/src/game/editor/map_view.cpp b/src/game/editor/map_view.cpp index 11f20665e..355eb8b91 100644 --- a/src/game/editor/map_view.cpp +++ b/src/game/editor/map_view.cpp @@ -8,9 +8,9 @@ #include "editor.h" -void CMapView::Init(CEditor *pEditor) +void CMapView::OnInit(CEditor *pEditor) { - CEditorComponent::Init(pEditor); + CEditorComponent::OnInit(pEditor); RegisterSubComponent(m_MapGrid); RegisterSubComponent(m_ProofMode); InitSubComponents(); @@ -19,7 +19,7 @@ void CMapView::Init(CEditor *pEditor) void CMapView::OnReset() { m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f); - m_Zoom.Init(Editor()); + m_Zoom.OnInit(Editor()); m_WorldZoom = 1.0f; SetWorldOffset({0, 0}); diff --git a/src/game/editor/map_view.h b/src/game/editor/map_view.h index 5aa86254d..ca99ca836 100644 --- a/src/game/editor/map_view.h +++ b/src/game/editor/map_view.h @@ -13,7 +13,7 @@ class CLayerGroup; class CMapView : public CEditorComponent { public: - void Init(CEditor *pEditor) override; + void OnInit(CEditor *pEditor) override; void OnReset() override; void OnMapLoad() override; diff --git a/src/game/editor/mapitems/image.cpp b/src/game/editor/mapitems/image.cpp index 34e5a40cf..1c55ae7e5 100644 --- a/src/game/editor/mapitems/image.cpp +++ b/src/game/editor/mapitems/image.cpp @@ -5,7 +5,7 @@ CEditorImage::CEditorImage(CEditor *pEditor) : m_AutoMapper(pEditor) { - Init(pEditor); + OnInit(pEditor); m_Texture.Invalidate(); } @@ -16,9 +16,9 @@ CEditorImage::~CEditorImage() m_pData = nullptr; } -void CEditorImage::Init(CEditor *pEditor) +void CEditorImage::OnInit(CEditor *pEditor) { - CEditorComponent::Init(pEditor); + CEditorComponent::OnInit(pEditor); RegisterSubComponent(m_AutoMapper); InitSubComponents(); } diff --git a/src/game/editor/mapitems/image.h b/src/game/editor/mapitems/image.h index 1ba25e951..52731f7ff 100644 --- a/src/game/editor/mapitems/image.h +++ b/src/game/editor/mapitems/image.h @@ -12,7 +12,7 @@ public: explicit CEditorImage(CEditor *pEditor); ~CEditorImage(); - void Init(CEditor *pEditor) override; + void OnInit(CEditor *pEditor) override; void AnalyseTileFlags(); bool DataEquals(const CEditorImage &Other) const; diff --git a/src/game/editor/mapitems/sound.cpp b/src/game/editor/mapitems/sound.cpp index a0c235131..33b260091 100644 --- a/src/game/editor/mapitems/sound.cpp +++ b/src/game/editor/mapitems/sound.cpp @@ -4,7 +4,7 @@ CEditorSound::CEditorSound(CEditor *pEditor) { - Init(pEditor); + OnInit(pEditor); } CEditorSound::~CEditorSound() diff --git a/src/game/editor/proof_mode.cpp b/src/game/editor/proof_mode.cpp index c03cb1f2f..769fee498 100644 --- a/src/game/editor/proof_mode.cpp +++ b/src/game/editor/proof_mode.cpp @@ -4,9 +4,9 @@ #include "editor.h" -void CProofMode::Init(CEditor *pEditor) +void CProofMode::OnInit(CEditor *pEditor) { - CEditorComponent::Init(pEditor); + CEditorComponent::OnInit(pEditor); SetMenuBackgroundPositionNames(); OnReset(); OnMapLoad(); diff --git a/src/game/editor/proof_mode.h b/src/game/editor/proof_mode.h index 81b77f8ea..ffffd8473 100644 --- a/src/game/editor/proof_mode.h +++ b/src/game/editor/proof_mode.h @@ -6,7 +6,7 @@ class CProofMode : public CEditorComponent { public: - void Init(CEditor *pEditor) override; + void OnInit(CEditor *pEditor) override; void OnReset() override; void OnMapLoad() override; void RenderScreenSizes();