AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CScanDisplay: Make constructor explicit 

Prevents error-prone implicit construction from occurring.
This commit is contained in:
Lioncash 2020-03-25 20:46:05 -04:00
parent 3c17336fb0
commit f4b3fb947e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/GuiSys/CHudDecoInterface.hpp
View File

@ -53,7 +53,7 @@ class CHudDecoInterfaceCombat : public IHudDecoInterface {
void UpdateVisibility(); void UpdateVisibility();
public: public:
CHudDecoInterfaceCombat(CGuiFrame& selHud); explicit CHudDecoInterfaceCombat(CGuiFrame& selHud);
void SetIsVisibleDebug(bool v) override; void SetIsVisibleDebug(bool v) override;
void SetIsVisibleGame(bool v) override; void SetIsVisibleGame(bool v) override;
void SetHudRotation(const zeus::CQuaternion& rot) override; void SetHudRotation(const zeus::CQuaternion& rot) override;
@ -142,7 +142,7 @@ class CHudDecoInterfaceXRay : public IHudDecoInterface {
void UpdateVisibility(); void UpdateVisibility();
public: public:
CHudDecoInterfaceXRay(CGuiFrame& selHud); explicit CHudDecoInterfaceXRay(CGuiFrame& selHud);
void SetIsVisibleDebug(bool v) override; void SetIsVisibleDebug(bool v) override;
void SetIsVisibleGame(bool v) override; void SetIsVisibleGame(bool v) override;
void SetHudRotation(const zeus::CQuaternion& rot) override; void SetHudRotation(const zeus::CQuaternion& rot) override;
@ -175,7 +175,7 @@ class CHudDecoInterfaceThermal : public IHudDecoInterface {
void UpdateVisibility(); void UpdateVisibility();
public: public:
CHudDecoInterfaceThermal(CGuiFrame& selHud); explicit CHudDecoInterfaceThermal(CGuiFrame& selHud);
void SetIsVisibleDebug(bool v) override; void SetIsVisibleDebug(bool v) override;
void SetIsVisibleGame(bool v) override; void SetIsVisibleGame(bool v) override;
void SetHudRotation(const zeus::CQuaternion& rot) override; void SetHudRotation(const zeus::CQuaternion& rot) override;

4
Runtime/GuiSys/CScanDisplay.hpp
View File

@ -43,7 +43,7 @@ public:
CTexturedQuadFilter m_quad; CTexturedQuadFilter m_quad;
public: public:
CDataDot(const TLockedToken<CTexture>& dataDotTex) : m_quad(EFilterType::Add, dataDotTex) {} explicit CDataDot(const TLockedToken<CTexture>& dataDotTex) : m_quad(EFilterType::Add, dataDotTex) {}
void Update(float dt); void Update(float dt);
void Draw(const zeus::CColor& color, float radius) const; void Draw(const zeus::CColor& color, float radius) const;
float GetTransitionFactor() const { return x1c_transDur > 0.f ? x20_remTime / x1c_transDur : 0.f; } float GetTransitionFactor() const { return x1c_transDur > 0.f ? x20_remTime / x1c_transDur : 0.f; }
@ -84,7 +84,7 @@ private:
static void SetScanMessageTypeEffect(CGuiTextPane* pane, bool type); static void SetScanMessageTypeEffect(CGuiTextPane* pane, bool type);
public: public:
CScanDisplay(const CGuiFrame& selHud); explicit CScanDisplay(const CGuiFrame& selHud);
void ProcessInput(const CFinalInput& input); void ProcessInput(const CFinalInput& input);
void StartScan(TUniqueId id, const CScannableObjectInfo& scanInfo, CGuiTextPane* message, CGuiTextPane* scrollMessage, void StartScan(TUniqueId id, const CScannableObjectInfo& scanInfo, CGuiTextPane* message, CGuiTextPane* scrollMessage,
CGuiWidget* textGroup, CGuiModel* xmark, CGuiModel* abutton, CGuiModel* dash, float scanTime); CGuiWidget* textGroup, CGuiModel* xmark, CGuiModel* abutton, CGuiModel* dash, float scanTime);