edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename Init method and move implementation

Browse source
This commit is contained in:
Robert Müller 2021-12-03 20:17:43 +01:00
parent 2fe5464938
commit a61c45550d
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/gameclient.cpp
View file

@ -219,7 +219,7 @@ void CGameClient::OnInit()
m_pGraphics->AddWindowResizeListener(OnWindowResizeCB, this); m_pGraphics->AddWindowResizeListener(OnWindowResizeCB, this);
// propagate pointers // propagate pointers
m_UI.SetGraphics(Graphics(), TextRender()); m_UI.Init(Graphics(), TextRender());
m_RenderTools.Init(Graphics(), UI(), this); m_RenderTools.Init(Graphics(), UI(), this);

6
src/game/client/ui.cpp
View file

@ -44,6 +44,12 @@ void CUIElement::SUIElementRect::Reset()
float CUI::ms_FontmodHeight = 0.8f; float CUI::ms_FontmodHeight = 0.8f;
void CUI::Init(class IGraphics *pGraphics, class ITextRender *pTextRender)
{
m_pGraphics = pGraphics;
m_pTextRender = pTextRender;
}
CUI::CUI() CUI::CUI()
{ {
m_pHotItem = 0; m_pHotItem = 0;

6
src/game/client/ui.h
View file

@ -200,11 +200,7 @@ public:
static float ms_FontmodHeight; static float ms_FontmodHeight;
// TODO: Refactor: Fill this in // TODO: Refactor: Fill this in
void SetGraphics(class IGraphics *pGraphics, class ITextRender *pTextRender) void Init(class IGraphics *pGraphics, class ITextRender *pTextRender);
{
m_pGraphics = pGraphics;
m_pTextRender = pTextRender;
}
class IGraphics *Graphics() const { return m_pGraphics; } class IGraphics *Graphics() const { return m_pGraphics; }
class ITextRender *TextRender() const { return m_pTextRender; } class ITextRender *TextRender() const { return m_pTextRender; }

2
src/game/editor/editor.cpp
View file

@ -6129,8 +6129,8 @@ void CEditor::Init()
m_pStorage = Kernel()->RequestInterface<IStorage>(); m_pStorage = Kernel()->RequestInterface<IStorage>();
m_pSound = Kernel()->RequestInterface<ISound>(); m_pSound = Kernel()->RequestInterface<ISound>();
CGameClient *pGameClient = (CGameClient *)Kernel()->RequestInterface<IGameClient>(); CGameClient *pGameClient = (CGameClient *)Kernel()->RequestInterface<IGameClient>();
m_UI.Init(m_pGraphics, m_pTextRender);
m_RenderTools.Init(m_pGraphics, &m_UI, pGameClient); m_RenderTools.Init(m_pGraphics, &m_UI, pGameClient);
m_UI.SetGraphics(m_pGraphics, m_pTextRender);
m_Map.m_pEditor = this; m_Map.m_pEditor = this;
UIEx()->Init(UI(), Kernel(), RenderTools(), Input()->GetEventsRaw(), Input()->GetEventCountRaw()); UIEx()->Init(UI(), Kernel(), RenderTools(), Input()->GetEventsRaw(), Input()->GetEventCountRaw());