mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

FIX: Song's Overlay with Fast Ocarina Playback (#2431)

Browse Source 
* FIX: Affected songs

* TWEAK: Addressed comments
This commit is contained in:
PurpleHato 2023-02-06 16:56:40 +01:00 committed by GitHub
parent 8a76a3aa83
commit 3218b2def2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
View File

@ -80,10 +80,11 @@ void OceffWipe_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx); OPEN_DISPS(play->state.gfxCtx);
int fastOcarinaPlayback = (CVarGetInteger("gFastOcarinaPlayback", 0) != 0);
if (this->timer < 32) { if (this->timer < 32) {
z = Math_SinS(this->timer << 9) * 1400; z = Math_SinS(this->timer << 9) * (fastOcarinaPlayback ? 1200.0f : 1400.0f);
} else { } else {
z = 1400; z = fastOcarinaPlayback ? 1200.0f : 1400.0f;
} }
if (this->timer >= 80) { if (this->timer >= 80) {

6
soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
View File

@ -71,10 +71,12 @@ void OceffWipe2_Draw(Actor* thisx, PlayState* play) {
eye = GET_ACTIVE_CAM(play)->eye; eye = GET_ACTIVE_CAM(play)->eye;
Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play)); Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play));
int fastOcarinaPlayback = (CVarGetInteger("gFastOcarinaPlayback", 0) != 0);
if (this->timer < 32) { if (this->timer < 32) {
z = Math_SinS(this->timer << 9) * 1330; z = Math_SinS(this->timer << 9) * (fastOcarinaPlayback ? 1200.0f : 1330.0f);
} else { } else {
z = 1330; z = fastOcarinaPlayback ? 1200.0f : 1330.0f;
} }
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);

6
soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
View File

@ -72,10 +72,12 @@ void OceffWipe3_Draw(Actor* thisx, PlayState* play) {
eye = GET_ACTIVE_CAM(play)->eye; eye = GET_ACTIVE_CAM(play)->eye;
Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play)); Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play));
int fastOcarinaPlayback = (CVarGetInteger("gFastOcarinaPlayback", 0) != 0);
if (this->counter < 32) { if (this->counter < 32) {
z = Math_SinS(this->counter << 9) * 1330; z = Math_SinS(this->counter << 9) * (fastOcarinaPlayback ? 1200.0f : 1330.0f);
} else { } else {
z = 1330; z = fastOcarinaPlayback ? 1200.0f : 1330.0f;
} }
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);

6
soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
View File

@ -67,10 +67,12 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) {
eye = GET_ACTIVE_CAM(play)->eye; eye = GET_ACTIVE_CAM(play)->eye;
Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play)); Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play));
int fastOcarinaPlayback = (CVarGetInteger("gFastOcarinaPlayback", 0) != 0);
if (this->timer < 16) { if (this->timer < 16) {
z = Math_SinS(this->timer * 1024) * 1330.0f; z = Math_SinS(this->timer * 1024) * (fastOcarinaPlayback ? 1200.0f : 1330.0f);
} else { } else {
z = 1330.0f; z = fastOcarinaPlayback ? 1200.0f : 1330.0f;
} }
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);