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

[Enhancements} Bow reticle (#335)

Browse Source 
* First pass

* spacing
This commit is contained in:
Patrick12115
2024-05-22 09:05:04 -05:00
committed by Garrett Cox
parent 84dd4713a5
commit 6ab624d432
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/2s2h/BenGui/BenMenuBar.cpp
+4 -1
View File
@@ -363,7 +363,10 @@ void DrawEnhancementsMenu() {
UIWidgets::CVarCheckbox("Authentic logo", "gEnhancements.Graphics.AuthenticLogo", {
.tooltip = "Hide the game version and build details and display the authentic model and texture on the boot logo start screen"
});
UIWidgets::CVarCheckbox("Bow Reticle", "gEnhancements.Graphics.BowReticle", {
.tooltip = "Gives the bow a reticle when you draw an arrow"
});
ImGui::EndMenu();
}
mm/src/code/z_player_lib.c
+16
View File
@@ -3641,6 +3641,22 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G
Player_DrawHookshotReticle(play, player, 77600.0f);
}
}
} else if (CVarGetInteger("gEnhancements.Graphics.BowReticle", 0) &&
((player->heldItemAction == PLAYER_IA_BOW_FIRE) ||
(player->heldItemAction == PLAYER_IA_BOW_ICE) ||
(player->heldItemAction == PLAYER_IA_BOW_LIGHT) ||
(player->heldItemAction == PLAYER_IA_BOW))) {
if (heldActor != NULL) {
MtxF sp44;
Matrix_RotateZYX(0, -15216, -17496, MTXMODE_APPLY);
Matrix_Get(&sp44);
if (func_800B7128(player) != 0) {
Matrix_Translate(500.0f, 300.0f, 0.0f, MTXMODE_APPLY);
Player_DrawHookshotReticle(play, player, 776000.0f);
}
}
} else if (player->meleeWeaponState != PLAYER_MELEE_WEAPON_STATE_0) {
if (player->meleeWeaponAnimation == PLAYER_MWA_GORON_PUNCH_RIGHT) {
func_80126B8C(play, player);