github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-24 07:05:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16 from garrettjoecox/fixes

Browse source 
Fixes
This commit is contained in:
Caladius 2023-11-28 16:40:39 -05:00 • committed by GitHub
commit f45c43abea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/src/code/z_player_lib.c
View file

@ -1681,7 +1681,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
Matrix_MultVec3f(&sZeroVec, D_80160000);
}
if (CVarGetInteger("gLetItSnow", 0) && !(this->stateFlags1 & PLAYER_STATE1_FIRST_PERSON)) {
if (CVarGetInteger("gLetItSnow", 0) && !(this->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) && !(this->stateFlags2 & PLAYER_STATE2_CRAWLING)) {
if (limbIndex == PLAYER_LIMB_HEAD) {
OPEN_DISPS(play->state.gfxCtx);

8
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -1278,6 +1278,14 @@ void EnHy_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
gSPDisplayList(POLY_OPA_DISP++, gPaperCrownGenericDL);
break;
}
case 1939: {
Matrix_RotateZYX(2656, 1328, 1992, MTXMODE_APPLY);
Matrix_Translate(1094.594f, 94.594f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(1.351f, 1.351f, 1.351f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gSantaHatGenericDL);
break;
}
default: {
Matrix_RotateZYX(0, 0, 664, MTXMODE_APPLY);
Matrix_Translate(783.784f, 94.594f, 0.0f, MTXMODE_APPLY);

6
soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -2556,10 +2556,10 @@ s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(PlayState* play, s32 limbIndex, Gfx
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sKokiriShopkeeperEyeTextures[this->eyeTextureIdx]));
}
if (limbIndex == 9) {
if (limbIndex == 15) {
Matrix_Push();
Matrix_RotateZYX(13948, 0, -1550, MTXMODE_APPLY);
Matrix_Translate(1837.838f, 0.000f, 540.541f, MTXMODE_APPLY);
Matrix_RotateZYX(14169, -2215, 0, MTXMODE_APPLY);
Matrix_Translate(1810.811f, -351.351f, -94.595f, MTXMODE_APPLY);
Matrix_Scale(1.068f, 1.068f, 1.068f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gSantaHatGenericDL);