PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building for host compiler 

Former-commit-id: 3417e5c576
This commit is contained in:
Henrique Gemignani Passos Lima 2023-01-19 11:15:00 +02:00
parent 4f772afca4
commit 79cd0d0c6b
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GuiSys/CGuiCompoundWidget.hpp
View File

@ -7,8 +7,8 @@ class CGuiCompoundWidget : public CGuiWidget {
public: public:
FourCC GetWidgetTypeID() const override { return -1; } FourCC GetWidgetTypeID() const override { return -1; }
void OnVisibleChange() override; void OnVisible() override;
void OnActiveChange() override; void OnActivate() override;
virtual CGuiWidget* GetWorkerWidget(int id) const; virtual CGuiWidget* GetWorkerWidget(int id) const;
private: private:
}; };

2
include/GuiSys/CGuiGroup.hpp
View File

@ -11,7 +11,7 @@ public:
CGuiWidget* GetSelectedWidget(); CGuiWidget* GetSelectedWidget();
const CGuiWidget* GetSelectedWidget() const; const CGuiWidget* GetSelectedWidget() const;
bool AddWorkerWidget(CGuiWidget* worker) override; bool AddWorkerWidget(CGuiWidget* worker) override;
void OnActiveChange() override; void OnActivate() override;
private: private:
uint xb8_workerCount; uint xb8_workerCount;

8
include/GuiSys/CGuiModel.hpp
View File

@ -14,10 +14,10 @@ public:
bool flag); bool flag);
const TLockedToken< CModel >& GetModel() const { return xb8_model; } const TLockedToken< CModel >& GetModel() const { return xb8_model; }
bool GetIsFinishedLoadingWidgetSpecific() override; bool GetIsFinishedLoadingWidgetSpecific() const override;
void Touch() override; void Touch() const override;
void Draw(const CGuiWidgetDrawParms& parms) override; void Draw(const CGuiWidgetDrawParms& parms) const override;
bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override; // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
private: private:
TLockedToken< CModel > xb8_model; TLockedToken< CModel > xb8_model;

2
include/GuiSys/CGuiPane.hpp
View File

@ -7,7 +7,7 @@ class CGuiPane : public CGuiWidget {
public: public:
CGuiPane(const CGuiWidgetParms& parms, const CVector2f& dim, const CVector3f& scaleCenter); CGuiPane(const CGuiWidgetParms& parms, const CVector2f& dim, const CVector3f& scaleCenter);
void Draw(const CGuiWidgetDrawParms& parms) override; void Draw(const CGuiWidgetDrawParms& parms) const override;
virtual void ScaleDimensions(const CVector3f& scale); virtual void ScaleDimensions(const CVector3f& scale);
virtual void SetDimensions(const CVector2f& dim, bool initVBO); virtual void SetDimensions(const CVector2f& dim, bool initVBO);
virtual CVector2f GetDimensions() const; virtual CVector2f GetDimensions() const;

6
include/GuiSys/CGuiTextPane.hpp
View File

@ -20,11 +20,11 @@ public:
CGuiTextSupport& TextSupport() { return xd4_textSupport; } CGuiTextSupport& TextSupport() { return xd4_textSupport; }
const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; } const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; }
void Update(float dt) override; void Update(float dt) override;
bool GetIsFinishedLoadingWidgetSpecific() override; bool GetIsFinishedLoadingWidgetSpecific() const override;
void SetDimensions(const CVector2f& dim, bool initVBO) override; void SetDimensions(const CVector2f& dim, bool initVBO) override;
void ScaleDimensions(const CVector3f& scale) override; void ScaleDimensions(const CVector3f& scale) override;
void Draw(const CGuiWidgetDrawParms& parms) override; void Draw(const CGuiWidgetDrawParms& parms) const override;
bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override; // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
private: private:
CGuiTextSupport xd4_textSupport; CGuiTextSupport xd4_textSupport;

2
src/Kyoto/Audio/DolphinCAudioSys.cpp
View File

@ -22,7 +22,7 @@ bool CAudioSys::mProLogic2 = true;
const rstl::string CAudioSys::mpDefaultInvalidString(rstl::string_l("NULL")); const rstl::string CAudioSys::mpDefaultInvalidString(rstl::string_l("NULL"));
void* DoMalloc(size_t len) { return new char[len]; } void* DoMalloc(u32 len) { return new char[len]; }
void DoFree(void* ptr) { void DoFree(void* ptr) {
if (!ptr) { if (!ptr) {