diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-06-20 22:54:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-20 16:54:31 -0600 |
| commit | e93633773efe6a8e737d935cb3392303c9579750 (patch) | |
| tree | d95239c25f61d689317e702a49e221dfbfe0195b /src/engine/HM_Intro.cpp | |
| parent | 2126c94a0ebac40d5390cbd99c582977aedd5c44 (diff) | |
Pr before release (#239)
* Fix match
* Update torch
* fix crash on texture of player
* Copied stuff over for Window icon from Starship.
* Missed comment.
* Corrections.
* Missed a file
* min-max fix
* Update code_80005FD0.c
* Remove interpolation for hm_intro
* look like to remove the crash in menu
* Update menu_items.c
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/engine/HM_Intro.cpp')
| -rw-r--r-- | src/engine/HM_Intro.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/HM_Intro.cpp b/src/engine/HM_Intro.cpp index 320ea9e45..67e8c4749 100644 --- a/src/engine/HM_Intro.cpp +++ b/src/engine/HM_Intro.cpp @@ -116,7 +116,7 @@ void HarbourMastersIntro::SpagBob(FVector& pos, IRotator& rot, f32 bobAmp, f32 b } void HarbourMastersIntro::HM_DrawIntro() { - FrameInterpolation_ShouldInterpolateFrame(false); + //FrameInterpolation_ShouldInterpolateFrame(false); HarbourMastersIntro::Setup(); gSPMatrix(gDisplayListHead++, &gGfxPool->mtxScreen, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); @@ -124,28 +124,28 @@ void HarbourMastersIntro::HM_DrawIntro() { gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetEnvColor(gDisplayListHead++, 0x00, 0x00, 0x00, 0x00); - FrameInterpolation_RecordOpenChild("spag_ship", 0); + //FrameInterpolation_RecordOpenChild("spag_ship", 0); Mat4 mtx_spaghettiShip; ApplyMatrixTransformations(mtx_spaghettiShip, _pos, _rot, _scale); render_set_position(mtx_spaghettiShip, 0); gSPDisplayList(gDisplayListHead++, ship1_spag1_mesh); - FrameInterpolation_RecordCloseChild(); + //FrameInterpolation_RecordCloseChild(); - FrameInterpolation_RecordOpenChild("ship2", 0); + //FrameInterpolation_RecordOpenChild("ship2", 0); Mat4 mtx_ship2; ApplyMatrixTransformations(mtx_ship2, _ship2Pos, _ship2Rot, _scale); render_set_position(mtx_ship2, 0); gSPDisplayList(gDisplayListHead++, ship2_SoH_mesh); - FrameInterpolation_RecordCloseChild(); + //FrameInterpolation_RecordCloseChild(); - FrameInterpolation_RecordOpenChild("ship3", 0); + //FrameInterpolation_RecordOpenChild("ship3", 0); Mat4 mtx_ship3; ApplyMatrixTransformations(mtx_ship3, _shipPos, _shipRot, _scale); render_set_position(mtx_ship3, 0); gSPDisplayList(gDisplayListHead++, ship3_2Ship_mesh); - FrameInterpolation_RecordCloseChild(); + //FrameInterpolation_RecordCloseChild(); - FrameInterpolation_RecordOpenChild("hm_geo", 0); + //FrameInterpolation_RecordOpenChild("hm_geo", 0); Mat4 mtx_geo; ApplyMatrixTransformations(mtx_geo, _hPos, _hRot, _hScale); render_set_position(mtx_geo, 0); @@ -155,17 +155,17 @@ void HarbourMastersIntro::HM_DrawIntro() { gSPDisplayList(gDisplayListHead++, castle_map_002_mesh); gSPDisplayList(gDisplayListHead++, road_map_001_mesh); gSPDisplayList(gDisplayListHead++, water_water1_mesh); - FrameInterpolation_RecordCloseChild(); + //FrameInterpolation_RecordCloseChild(); - FrameInterpolation_RecordOpenChild("hm_lus", 0); + //FrameInterpolation_RecordOpenChild("hm_lus", 0); Mat4 lusMtx; ApplyMatrixTransformations(lusMtx, lusPos, lusRot, lusScale); render_set_position(lusMtx, 0); gSPDisplayList(gDisplayListHead++, (Gfx*)"__OTR__hmintro/poweredbylus"); - FrameInterpolation_RecordCloseChild(); + //FrameInterpolation_RecordCloseChild(); HarbourMastersIntro::Sync(); - FrameInterpolation_ShouldInterpolateFrame(true); + //FrameInterpolation_ShouldInterpolateFrame(true); } void HarbourMastersIntro::Setup() { |