mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-09-23 14:13:59 -07:00
parent 014f9ae38b
commit f04f4f219f
4 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTGamePad.h
+2 -11
View File
@@ -81,27 +81,19 @@ public:
}
u32 getButton() const { return mButton.mButton; }
u32 getTrigger() const { return mButton.mTrigger; }
f32 getMainStickX() const { return mMainStick.mPosX; }
f32 getMainStickY() const { return mMainStick.mPosY; }
f32 getMainStickValue() const { return mMainStick.mValue; }
s16 getMainStickAngle() const { return mMainStick.mAngle; }
f32 getSubStickX() const { return mSubStick.mPosX; }
f32 getSubStickY() const { return mSubStick.mPosY; }
f32 getSubStickValue() const { return mSubStick.mValue; }
s16 getSubStickAngle() const { return mSubStick.mAngle; }
u8 getAnalogA() const { return mButton.mAnalogA; }
u8 getAnalogB() const { return mButton.mAnalogB; }
u8 getAnalogL() const { return mButton.mAnalogL; }
@@ -111,14 +103,13 @@ public:
f32 getAnalogRf() const { return mButton.mAnalogRf; }
s8 getErrorStatus() const { return mErrorStatus; }
s16 getPortNum() const { return mPortNum; }
JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; }
JUTGamePadRecordBase* getPadRecord() const { return mPadRecord; }
u32 testTrigger(u32 button) const { return mButton.mTrigger & button; }
u32 testButton(u32 button) const { return getButton() & button; }
u32 testTrigger(u32 button) const { return getTrigger() & button; }
bool isPushing3ButtonReset() const {
bool isPushingReset = false;
src/c/c_dylink.cpp
+3 -3
View File
@@ -72,11 +72,11 @@ const DynamicNameTableEntry DynamicNameTable[] = {
{PROC_Obj_Lpalm, "d_a_obj_lpalm"},
{PROC_Obj_Mtest, "d_a_obj_mtest"},
{PROC_Obj_Mkie, "d_a_obj_mkie"},
{PROC_Obj_Mkie, "d_a_obj_mkiek"},
{PROC_Obj_Mkiek, "d_a_obj_mkiek"},
{PROC_Obj_MknjD, "d_a_obj_mknjd"},
{PROC_Obj_Msdan, "d_a_obj_msdan"},
{PROC_Obj_Msdan, "d_a_obj_msdan_sub"},
{PROC_Obj_Msdan, "d_a_obj_msdan2"},
{PROC_Obj_MsdanSub, "d_a_obj_msdan_sub"},
{PROC_Obj_Msdan2, "d_a_obj_msdan2"},
{PROC_Obj_MsdanSub2, "d_a_obj_msdan_sub2"},
{PROC_Obj_Nest, "d_a_obj_nest"},
{PROC_Obj_Ojtree, "d_a_obj_ojtree"},
src/m_Do/m_Do_controller_pad.cpp
-1
View File
@@ -31,7 +31,6 @@ inline void mDoCPd_TRIGGER_CONV(u8 analog, f32& param_1) {
/* 80007598-800078C0 .text mDoCPd_Convert__FP27interface_of_controller_padP10JUTGamePad */
// NONMATCHING
static s32 mDoCPd_Convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad) {
// pInterface->mButtonFlags = pPad->getButton();
pInterface->mMainStickPosX = pPad->getMainStickX();
pInterface->mMainStickPosY = pPad->getMainStickY();
pInterface->mMainStickValue = pPad->getMainStickValue();
src/m_Do/m_Do_main.cpp
+3 -12
View File
@@ -93,11 +93,8 @@ void CheckHeap(JUTGamePad* i_pad) {
bool comboCheck = false;
// if L + R + Z is pressed
if ((i_pad->getButton() & ~CButton::Z) == (CButton::L + CButton::R) &&
i_pad->getTrigger() & CButton::Z)
{
if ((i_pad->testButton(~CButton::Z)) == (CButton::L | CButton::R) && i_pad->testTrigger(CButton::Z))
comboCheck = true;
}
int saveRel = comboCheck;
for (int i = 0; i < HeapCheckTableNum; i++) {
@@ -377,18 +374,12 @@ void debug() {
CheckHeap(g_mDoCPd_gamePad[2]);
}
if ((g_mDoCPd_gamePad[2]->getButton() & ~CButton::Z) == CButton::R &&
g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
{
if (g_mDoCPd_gamePad[2]->testButton(~CButton::Z) == CButton::R && g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
mDisplayHeapSize ^= 1;
}
if (mDisplayHeapSize) {
if ((g_mDoCPd_gamePad[2]->getButton() & ~CButton::Z) == CButton::L &&
g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
{
if (g_mDoCPd_gamePad[2]->testButton(~CButton::Z) == CButton::L && g_mDoCPd_gamePad[2]->testTrigger(CButton::Z))
mHeapBriefType < 5 ? mHeapBriefType++ : mHeapBriefType = 1;
}
debugDisplay();
}