mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes

This commit is contained in:
Patrick12115 2024-05-09 23:26:07 -04:00
parent e644ed16f7
commit 13141f2cfb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -324,8 +324,8 @@ void ArmsHook_Draw(Actor* thisx, PlayState* play) {
func_80090480(play, &this->collider, &this->hookInfo, &sp6C, &sp60);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
if (CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible", 0) &&
CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquimentAsChild", 0) && LINK_IS_CHILD) {
if (CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible"), 0) &&
CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquimentAsChild"), 0) && LINK_IS_CHILD) {
Matrix_Scale(0.8, 0.8, 0.8, MTXMODE_APPLY);
}
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
@ -337,8 +337,8 @@ void ArmsHook_Draw(Actor* thisx, PlayState* play) {
sp5C = sqrtf(sp58);
Matrix_RotateY(Math_FAtan2F(sp78.x, sp78.z), MTXMODE_APPLY);
Matrix_RotateX(Math_FAtan2F(-sp78.y, sp5C), MTXMODE_APPLY);
if (CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible", 0) &&
CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquimentAsChild", 0) && LINK_IS_CHILD) {
if (CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible"), 0) &&
CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquimentAsChild"), 0) && LINK_IS_CHILD) {
Matrix_Scale(0.012f, 0.012f, sqrtf(SQ(sp78.y) + sp58) * 0.01f, MTXMODE_APPLY);
} else {
Matrix_Scale(0.015f, 0.015f, sqrtf(SQ(sp78.y) + sp58) * 0.01f, MTXMODE_APPLY);

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -5355,7 +5355,7 @@ s32 func_8083AD4C(PlayState* play, Player* this) {
if (func_8002DD6C(this)) {
bool shouldUseBowCamera = LINK_IS_ADULT;
if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible", 0)) {
if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible"), 0)) {
shouldUseBowCamera = this->heldItemAction != PLAYER_IA_SLINGSHOT;
}
@ -12296,7 +12296,7 @@ s32 func_8084B3CC(PlayState* play, Player* this) {
if (!func_8002DD6C(this) || Player_HoldsHookshot(this)) {
s32 projectileItemToUse = ITEM_BOW;
if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible", 0)) {
if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquimentAlwaysVisible"), 0)) {
projectileItemToUse = LINK_IS_ADULT ? ITEM_BOW : ITEM_SLINGSHOT;
}