izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix DoActions on B (mac) (#66)

Browse Source 
* fix doaction on B mac

* add comment
This commit is contained in:
inspectredc
2024-05-22 09:04:58 -05:00
committed by Garrett Cox
parent dbbcd9b1b6
commit 63f7d07b39
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/include/z64interface.h
+2 -1
View File
@@ -23,7 +23,8 @@ typedef enum {
} AButtonState;
typedef enum {
/* 0x00 */ DO_ACTION_ATTACK,
/* -1 */ DO_ACTION_UNDEFINED = -1, // #Region [2s2h] DO_ACTION_UNDEFINED added so comparisons between the enum type and -1 would work on all systems
/* 0x00 */ DO_ACTION_ATTACK = 0,
/* 0x01 */ DO_ACTION_CHECK,
/* 0x02 */ DO_ACTION_ENTER,
/* 0x03 */ DO_ACTION_RETURN,
mm/src/overlays/actors/ovl_player_actor/z_player.c
+2 -2
View File
@@ -10955,7 +10955,7 @@ void Player_SetDoAction(PlayState* play, Player* this) {
return;
}
doActionB = -1;
doActionB = DO_ACTION_UNDEFINED;
sp38 = func_801242B4(this) || (Player_Action_28 == this->actionFunc);
// Set B do action
@@ -10986,7 +10986,7 @@ void Player_SetDoAction(PlayState* play, Player* this) {
}
}
if (doActionB > -1) {
if (doActionB > DO_ACTION_UNDEFINED) {
Interface_SetBButtonDoAction(play, doActionB);
} else if (play->interfaceCtx.bButtonDoActionActive) {
play->interfaceCtx.bButtonDoActionActive = false;