diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-06-23 21:56:41 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-06-23 21:56:41 -0400 |
| commit | 5ea6edc4b299331f9958b2fb68308ed386a1e280 (patch) | |
| tree | 4e7a338a5d72ea7a5eed90aa5676d43feadb93d5 /include/JSystem | |
| parent | cabd8356fefae9b26a8f466ba3be875302812914 (diff) | |
m_Do_main OK for demo
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JKernel/JKRHeap.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTGamePad.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index aa9a25da..53b0f526 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -60,7 +60,7 @@ public: /* vt[03] */ virtual void callAllDisposer(); /* vt[04] */ virtual u32 getHeapType() = 0; /* vt[05] */ virtual bool check() = 0; - /* vt[06] */ virtual bool dump_sort(); + /* vt[06] */ virtual bool dump_sort() { return true; } /* vt[07] */ virtual bool dump() = 0; /* vt[08] */ virtual void do_destroy() = 0; /* vt[09] */ virtual void* do_alloc(u32 size, int alignment) = 0; diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index a2e18653..a25a55a0 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -110,8 +110,8 @@ public: JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; } JUTGamePadRecordBase* getPadRecord() const { return mPadRecord; } - u32 testButton(u32 button) const { return getButton() & button; } - u32 testTrigger(u32 button) const { return getTrigger() & button; } + bool testButton(u32 button) const { return mButton.mButton & button; } + bool testTrigger(u32 button) const { return mButton.mTrigger & button; } bool isPushing3ButtonReset() const { bool isPushingReset = false; |
