diff --git a/Source/Contents/Async/AsyncWorkMgr.h b/Source/Contents/Async/AsyncWorkMgr.h index b03b379..f40520f 100644 --- a/Source/Contents/Async/AsyncWorkMgr.h +++ b/Source/Contents/Async/AsyncWorkMgr.h @@ -64,6 +64,7 @@ public: void StopRecruiting(std::uint32_t accountId, std::string world, std::string url, std::string token, std::uint32_t masterAccountId, StopRecruitingContext& context); + // INLINED CAsyncWorkRecycleObjectPoolMgr& Pools() { return *this->m_pools; } diff --git a/Source/Contents/Models/ModelRendering.cpp b/Source/Contents/Models/ModelRendering.cpp index 7dadcbc..b27d854 100644 --- a/Source/Contents/Models/ModelRendering.cpp +++ b/Source/Contents/Models/ModelRendering.cpp @@ -10,6 +10,7 @@ #include "Utility/Math/ScalarConversion.h" #include +// INLINED ModelRenderContext::ModelRenderContext( const RenderProjection& projection, RenderCommandPool& commands, RenderVertexPool& vertices, RenderQueues& queues, const int& width, const int& height, const bool& depthAlpha, const float& depthStart, const float& depthEnd, const bool& overrideColor, const bool& integerColor, const float* overrideScale, diff --git a/Source/Network/Connection/Connection.h b/Source/Network/Connection/Connection.h index 6cb1986..33b0aef 100644 --- a/Source/Network/Connection/Connection.h +++ b/Source/Network/Connection/Connection.h @@ -46,12 +46,15 @@ public: void ResetBuffers(); void SetDeferred(unsigned char value); + // INLINED SOCKET NativeSocket() const { return this->m_socket; } + // INLINED ConnectionBuffer& Input() { return this->m_input; } + // INLINED unsigned& SendDeadline() { return this->m_sendDeadline; } diff --git a/Source/Render/DX7/RenderSystemDX7.h b/Source/Render/DX7/RenderSystemDX7.h index cb43256..175c24a 100644 --- a/Source/Render/DX7/RenderSystemDX7.h +++ b/Source/Render/DX7/RenderSystemDX7.h @@ -32,6 +32,7 @@ public: HRESULT TestDevice() override; HRESULT Present(bool option) override; + // INLINED DeviceOwnerDX7* Device() const { return this->m_device; } diff --git a/Source/Render/DX9/DeviceOwnerDX9.cpp b/Source/Render/DX9/DeviceOwnerDX9.cpp index b3fa12d..4c27141 100644 --- a/Source/Render/DX9/DeviceOwnerDX9.cpp +++ b/Source/Render/DX9/DeviceOwnerDX9.cpp @@ -269,10 +269,12 @@ HRESULT DeviceOwnerDX9::Present(int) { return this->lastPresent; } +// INLINED SurfaceDX9Context DeviceOwnerDX9::SurfaceContext() const { return {this->device, this->backBufferDescription, this->backBuffer}; } +// INLINED TextureDX9Context DeviceOwnerDX9::TextureContext( D3DX9Runtime& d3dx, RenderPrimitivePool& primitives, RenderQueues& queues, bool depthAlpha, float depthStart, float depthEnd ) const { diff --git a/Source/Render/DX9/RenderSystemDX9.cpp b/Source/Render/DX9/RenderSystemDX9.cpp index b020c4f..f02bf9f 100644 --- a/Source/Render/DX9/RenderSystemDX9.cpp +++ b/Source/Render/DX9/RenderSystemDX9.cpp @@ -23,6 +23,7 @@ CRenderSystemDX9::~CRenderSystemDX9() { delete this->m_defaultTexture; } +// INLINED void CRenderSystemDX9::RefreshContexts() { this->m_surfaceContext = this->m_device->SurfaceContext(); auto& context = this->m_textureContext; @@ -43,6 +44,7 @@ std::int32_t CRenderSystemDX9::Backend() { return 2; } +// INLINED HRESULT CRenderSystemDX9::Initialize(HWND window) { const HRESULT result = InitializeConfiguredDeviceDX9(*this->m_device, window, this->m_context->deviceOptions, this->m_context->adapter, this->m_context->serviceUsesDX7); diff --git a/Source/Render/DX9/RenderSystemDX9.h b/Source/Render/DX9/RenderSystemDX9.h index 6c27754..d4800f6 100644 --- a/Source/Render/DX9/RenderSystemDX9.h +++ b/Source/Render/DX9/RenderSystemDX9.h @@ -49,6 +49,7 @@ public: HRESULT TestDevice() override; HRESULT Present(bool option) override; + // INLINED DeviceOwnerDX9& Device() { return *this->m_device; } diff --git a/Source/Render/DX9/ScreenshotDX9.cpp b/Source/Render/DX9/ScreenshotDX9.cpp index 08d5cef..0bfb5da 100644 --- a/Source/Render/DX9/ScreenshotDX9.cpp +++ b/Source/Render/DX9/ScreenshotDX9.cpp @@ -9,6 +9,7 @@ namespace { class ScreenshotOverlay : public UIRPData { public: + // INLINED const std::list& Primitives() const { return this->m_primitives; } diff --git a/Source/Render/Projection/RendererViewport.cpp b/Source/Render/Projection/RendererViewport.cpp index 6896f41..dc0456c 100644 --- a/Source/Render/Projection/RendererViewport.cpp +++ b/Source/Render/Projection/RendererViewport.cpp @@ -30,6 +30,7 @@ void RendererViewport::SetSize(int columns, int rows, const float& projectionSca cotangent = projectionScale / this->uiScaleY; } +// INLINED RenderProjection RendererViewport::Projection() const { return {this->scaleX, this->scaleY, this->centerX, this->centerY}; } diff --git a/Source/Resource/Resource.cpp b/Source/Resource/Resource.cpp index d7367f3..d87556e 100644 --- a/Source/Resource/Resource.cpp +++ b/Source/Resource/Resource.cpp @@ -11,6 +11,7 @@ ResourceName::ResourceName(const char* name) { this->Assign(name); } +// INLINED void ResourceName::Assign(const char* name) { myGPack::AssignNameKey(this->hash, this->text, name); } diff --git a/Source/Resource/ResourceFailures.cpp b/Source/Resource/ResourceFailures.cpp index 6b53357..ea9320a 100644 --- a/Source/Resource/ResourceFailures.cpp +++ b/Source/Resource/ResourceFailures.cpp @@ -3,10 +3,12 @@ #include +// INLINED ResourceFailures::ResourceFailures(ResourceMessages& messages) : m_messages(&messages) { InitializeCriticalSection(&this->m_lock); } +// INLINED ResourceFailures::~ResourceFailures() { DeleteCriticalSection(&this->m_lock); } diff --git a/Source/Resource/World/TerrainResource.cpp b/Source/Resource/World/TerrainResource.cpp index 6fa8e20..88fcafb 100644 --- a/Source/Resource/World/TerrainResource.cpp +++ b/Source/Resource/World/TerrainResource.cpp @@ -75,6 +75,7 @@ void C3dAttr::Unload() { this->height = 0; } +// INLINED TerrainHeight C3dAttr::Grid() const { return {this->width, this->height, this->cellSize, this->m_cells.data()}; } diff --git a/Source/UI/Cooldowns/CooldownOwner.cpp b/Source/UI/Cooldowns/CooldownOwner.cpp index 667db74..d330e80 100644 --- a/Source/UI/Cooldowns/CooldownOwner.cpp +++ b/Source/UI/Cooldowns/CooldownOwner.cpp @@ -28,11 +28,13 @@ void CooldownOwner::ClearReverseCommands() { this->m_drawing.reverse.clear(); } +// INLINED CooldownState* CooldownOwner::Find(unsigned id) { const auto entry = this->m_values.find(id); return entry == this->m_values.end() ? nullptr : &entry->second; } +// INLINED void CooldownOwner::Erase(unsigned id) { this->m_values.erase(id); } diff --git a/Source/UI/Edit/ItemTagRetirement.cpp b/Source/UI/Edit/ItemTagRetirement.cpp index 163696d..fdaeb89 100644 --- a/Source/UI/Edit/ItemTagRetirement.cpp +++ b/Source/UI/Edit/ItemTagRetirement.cpp @@ -2,6 +2,7 @@ #include "UI/Edit/ItemTagRetirement.h" #include "UI/Window/UIWindow.h" +// INLINED FocusedItemTagRemoval::FocusedItemTagRemoval(InputFocus& focus) : m_focus(focus) { } diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 4f60255..ac84bcc 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -187,9 +187,11 @@ void EditPainting::Draw() { } class LinkLayout : public EditLinkLayout { public: + // INLINED explicit LinkLayout(UIEditCtrl& control) : m_control(control) { } + // INLINED void Update() override { this->m_control.UpdateLinks(); } diff --git a/Source/UI/Lists/UIComboBoxEx.cpp b/Source/UI/Lists/UIComboBoxEx.cpp index 9c596a9..105a037 100644 --- a/Source/UI/Lists/UIComboBoxEx.cpp +++ b/Source/UI/Lists/UIComboBoxEx.cpp @@ -10,6 +10,7 @@ #include namespace { + // INLINED unsigned Palette(ResourceMgr& resources, int column, int row) { constexpr char path[] = "유저인터페이스\\colorchip.bmp"; auto* chip = static_cast(resources.Load(path)); diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index 1fb9236..f39f339 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -216,6 +216,7 @@ void UIRegisterPartyWnd::SetInfo(CAdvenPartyInfo value) { this->Invalidate(); } +// INLINED const char* UIRegisterPartyWnd::Text(UIEditCtrl& control) const { const auto& edit = this->m_registration->edits; return edit.focus.window == &control ? edit.input.text.c_str() : control.text.c_str(); diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index 23cb5af..a04234f 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -32,6 +32,7 @@ namespace { } } + // INLINED SIZE Measure(UIBalloonText& window, BalloonTextContext& owner, const std::string& text, int family, int height) { if (text.empty()) { return {0, 0}; diff --git a/Source/UI/Text/UITextViewerLinks.cpp b/Source/UI/Text/UITextViewerLinks.cpp index 0bc68ce..b379977 100644 --- a/Source/UI/Text/UITextViewerLinks.cpp +++ b/Source/UI/Text/UITextViewerLinks.cpp @@ -11,6 +11,7 @@ #include +// INLINED std::string UITextViewer::ConvertChat(std::string text) { std::string converted; DisplayNavigationLink(converted, text); diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 0f75d27..a8464a6 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -17,6 +17,7 @@ namespace { constexpr char prefix[] = "유저인터페이스\\"; + // INLINED std::uint32_t Palette(ResourceMgr& resources, int x, int y) { const auto* resource = static_cast(resources.Load((std::string(prefix) + "colorchip.bmp").c_str())); const auto& image = resource->image;